summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-15 23:15:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-22 09:16:00 +0100
commit4c2d0b1205be2c0e42cafea1de18e46edf4a374b (patch)
tree929918f4745764c3b5618f1489e540cf0645eeb4
parent39df3561d8cb0d6d86d492bb462640cf2f0a760a (diff)
downloadpoky-4c2d0b1205be2c0e42cafea1de18e46edf4a374b.tar.gz
meta: Remove further uclibc remnants (inc. patches and site files)
Some of these are clearly dead, e.g. one binutils patch reverts the effects of the earlier one. This also removes the uclibc site files. We now have mechanisms to allow these to be extended from another layer should someone ever wish to do that. (From OE-Core rev: e01e7c543a559c8926d72159b5cd55db0c661434) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cross-canadian.bbclass6
-rw-r--r--meta/classes/icecc.bbclass2
-rw-r--r--meta/classes/insane.bbclass24
-rw-r--r--meta/classes/siteinfo.bbclass8
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/configure.patch12
-rw-r--r--meta/recipes-bsp/pciutils/pciutils/guess-fix.patch12
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc3
-rw-r--r--meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch4
-rw-r--r--meta/recipes-connectivity/openssl/openssl/configure-targets.patch4
-rw-r--r--meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch48
-rw-r--r--meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch25
-rw-r--r--meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch41
-rw-r--r--meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch49
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb3
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.28.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch31
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch52
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch12
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-runtime.inc4
-rw-r--r--meta/recipes-devtools/gcc/libgcc.inc4
-rw-r--r--meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch68
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.5.13.bb3
-rw-r--r--meta/site/arm-linux-uclibc105
-rw-r--r--meta/site/armeb-linux-uclibc38
-rw-r--r--meta/site/common-uclibc52
-rw-r--r--meta/site/mips-linux-uclibc80
-rw-r--r--meta/site/mips64-linux-uclibc83
-rw-r--r--meta/site/mips64el-linux-uclibc108
-rw-r--r--meta/site/mipsel-linux-uclibc100
-rw-r--r--meta/site/x86_64-linux-uclibc91
31 files changed, 24 insertions, 1052 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 49388d4cf2..8554e87521 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -15,7 +15,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS 15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
16# 16#
17PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}" 17PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
18BASECANADIANEXTRAOS ?= "linux-uclibc linux-musl" 18BASECANADIANEXTRAOS ?= "linux-musl"
19CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}" 19CANADIANEXTRAOS = "${BASECANADIANEXTRAOS}"
20CANADIANEXTRAVENDOR = "" 20CANADIANEXTRAVENDOR = ""
21MODIFYTOS ??= "1" 21MODIFYTOS ??= "1"
@@ -36,8 +36,6 @@ python () {
36 tos = d.getVar("TARGET_OS") 36 tos = d.getVar("TARGET_OS")
37 whitelist = [] 37 whitelist = []
38 extralibcs = [""] 38 extralibcs = [""]
39 if "uclibc" in d.getVar("BASECANADIANEXTRAOS"):
40 extralibcs.append("uclibc")
41 if "musl" in d.getVar("BASECANADIANEXTRAOS"): 39 if "musl" in d.getVar("BASECANADIANEXTRAOS"):
42 extralibcs.append("musl") 40 extralibcs.append("musl")
43 for variant in ["", "spe", "x32", "eabi", "n32"]: 41 for variant in ["", "spe", "x32", "eabi", "n32"]:
@@ -80,7 +78,7 @@ python () {
80 for extraos in d.getVar("BASECANADIANEXTRAOS").split(): 78 for extraos in d.getVar("BASECANADIANEXTRAOS").split():
81 d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32") 79 d.appendVar("CANADIANEXTRAOS", " " + extraos + "n32")
82 if tarch == "arm" or tarch == "armeb": 80 if tarch == "arm" or tarch == "armeb":
83 d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi linux-uclibceabi") 81 d.appendVar("CANADIANEXTRAOS", " linux-gnueabi linux-musleabi")
84 d.setVar("TARGET_OS", "linux-gnueabi") 82 d.setVar("TARGET_OS", "linux-gnueabi")
85 else: 83 else:
86 d.setVar("TARGET_OS", "linux") 84 d.setVar("TARGET_OS", "linux")
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 8a351cf3b8..8a3308bdda 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -115,7 +115,7 @@ def use_icecc(bb,d):
115 # for one reason or the other 115 # for one reason or the other
116 # this is the old list (which doesn't seem to be valid anymore, because I was able to build 116 # this is the old list (which doesn't seem to be valid anymore, because I was able to build
117 # all these with icecc enabled) 117 # all these with icecc enabled)
118 # system_package_blacklist = [ "uclibc", "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman", "orbit2" ] 118 # system_package_blacklist = [ "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman", "orbit2" ]
119 # when adding new entry, please document why (how it failed) so that we can re-evaluate it later 119 # when adding new entry, please document why (how it failed) so that we can re-evaluate it later
120 # e.g. when there is new version 120 # e.g. when there is new version
121 # building libgcc-initial with icecc fails with CPP sanity check error if host sysroot contains cross gcc built for another target tune/variant 121 # building libgcc-initial with icecc fails with CPP sanity check error if host sysroot contains cross gcc built for another target tune/variant
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index f6fd7c74d8..7444c58c28 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -103,23 +103,6 @@ def package_qa_get_machine_dict(d):
103 "microblazeeb":(189, 0, 0, False, 32), 103 "microblazeeb":(189, 0, 0, False, 32),
104 "microblazeel":(189, 0, 0, True, 32), 104 "microblazeel":(189, 0, 0, True, 32),
105 }, 105 },
106 "linux-uclibc" : {
107 "arm" : ( 40, 97, 0, True, 32),
108 "armeb": ( 40, 97, 0, False, 32),
109 "powerpc": ( 20, 0, 0, False, 32),
110 "i386": ( 3, 0, 0, True, 32),
111 "i486": ( 3, 0, 0, True, 32),
112 "i586": ( 3, 0, 0, True, 32),
113 "i686": ( 3, 0, 0, True, 32),
114 "x86_64": ( 62, 0, 0, True, 64),
115 "mips": ( 8, 0, 0, False, 32),
116 "mipsel": ( 8, 0, 0, True, 32),
117 "mips64": ( 8, 0, 0, False, 64),
118 "mips64el": ( 8, 0, 0, True, 64),
119 "avr32": (6317, 0, 0, False, 32),
120 "sh4": (42, 0, 0, True, 32),
121
122 },
123 "linux-musl" : { 106 "linux-musl" : {
124 "aarch64" : (183, 0, 0, True, 64), 107 "aarch64" : (183, 0, 0, True, 64),
125 "aarch64_be" :(183, 0, 0, False, 64), 108 "aarch64_be" :(183, 0, 0, False, 64),
@@ -151,19 +134,12 @@ def package_qa_get_machine_dict(d):
151 "arm" : (40, 0, 0, True, 32), 134 "arm" : (40, 0, 0, True, 32),
152 "armeb" : (40, 0, 0, False, 32), 135 "armeb" : (40, 0, 0, False, 32),
153 }, 136 },
154 "linux-uclibceabi" : {
155 "arm" : (40, 0, 0, True, 32),
156 "armeb" : (40, 0, 0, False, 32),
157 },
158 "linux-gnuspe" : { 137 "linux-gnuspe" : {
159 "powerpc": (20, 0, 0, False, 32), 138 "powerpc": (20, 0, 0, False, 32),
160 }, 139 },
161 "linux-muslspe" : { 140 "linux-muslspe" : {
162 "powerpc": (20, 0, 0, False, 32), 141 "powerpc": (20, 0, 0, False, 32),
163 }, 142 },
164 "linux-uclibcspe" : {
165 "powerpc": (20, 0, 0, False, 32),
166 },
167 "linux-gnu" : { 143 "linux-gnu" : {
168 "powerpc": (20, 0, 0, False, 32), 144 "powerpc": (20, 0, 0, False, 32),
169 "sh4": (42, 0, 0, True, 32), 145 "sh4": (42, 0, 0, True, 32),
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 2c33732be3..90ea5ba807 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -62,9 +62,6 @@ def siteinfo_data(d):
62 "linux-gnun32": "common-linux common-glibc", 62 "linux-gnun32": "common-linux common-glibc",
63 "linux-gnueabi": "common-linux common-glibc", 63 "linux-gnueabi": "common-linux common-glibc",
64 "linux-gnuspe": "common-linux common-glibc", 64 "linux-gnuspe": "common-linux common-glibc",
65 "linux-uclibc": "common-linux common-uclibc",
66 "linux-uclibceabi": "common-linux common-uclibc",
67 "linux-uclibcspe": "common-linux common-uclibc",
68 "linux-musl": "common-linux common-musl", 65 "linux-musl": "common-linux common-musl",
69 "linux-musleabi": "common-linux common-musl", 66 "linux-musleabi": "common-linux common-musl",
70 "linux-muslspe": "common-linux common-musl", 67 "linux-muslspe": "common-linux common-musl",
@@ -79,9 +76,7 @@ def siteinfo_data(d):
79 "aarch64_be-linux-musl": "aarch64_be-linux", 76 "aarch64_be-linux-musl": "aarch64_be-linux",
80 "arm-linux-gnueabi": "arm-linux", 77 "arm-linux-gnueabi": "arm-linux",
81 "arm-linux-musleabi": "arm-linux", 78 "arm-linux-musleabi": "arm-linux",
82 "arm-linux-uclibceabi": "arm-linux-uclibc",
83 "armeb-linux-gnueabi": "armeb-linux", 79 "armeb-linux-gnueabi": "armeb-linux",
84 "armeb-linux-uclibceabi": "armeb-linux-uclibc",
85 "armeb-linux-musleabi": "armeb-linux", 80 "armeb-linux-musleabi": "armeb-linux",
86 "mips-linux-musl": "mips-linux", 81 "mips-linux-musl": "mips-linux",
87 "mipsel-linux-musl": "mipsel-linux", 82 "mipsel-linux-musl": "mipsel-linux",
@@ -93,10 +88,8 @@ def siteinfo_data(d):
93 "mipsisa64r6el-linux-gnun32": "mipsisa32r6el-linux bit-32", 88 "mipsisa64r6el-linux-gnun32": "mipsisa32r6el-linux bit-32",
94 "powerpc-linux": "powerpc32-linux", 89 "powerpc-linux": "powerpc32-linux",
95 "powerpc-linux-musl": "powerpc-linux powerpc32-linux", 90 "powerpc-linux-musl": "powerpc-linux powerpc32-linux",
96 "powerpc-linux-uclibc": "powerpc-linux powerpc32-linux",
97 "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux", 91 "powerpc-linux-gnuspe": "powerpc-linux powerpc32-linux",
98 "powerpc-linux-muslspe": "powerpc-linux powerpc32-linux", 92 "powerpc-linux-muslspe": "powerpc-linux powerpc32-linux",
99 "powerpc-linux-uclibcspe": "powerpc-linux powerpc32-linux powerpc-linux-uclibc",
100 "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux", 93 "powerpc64-linux-gnuspe": "powerpc-linux powerpc64-linux",
101 "powerpc64-linux-muslspe": "powerpc-linux powerpc64-linux", 94 "powerpc64-linux-muslspe": "powerpc-linux powerpc64-linux",
102 "powerpc64-linux": "powerpc-linux", 95 "powerpc64-linux": "powerpc-linux",
@@ -106,7 +99,6 @@ def siteinfo_data(d):
106 "x86_64-darwin9": "bit-64", 99 "x86_64-darwin9": "bit-64",
107 "x86_64-linux": "bit-64", 100 "x86_64-linux": "bit-64",
108 "x86_64-linux-musl": "x86_64-linux bit-64", 101 "x86_64-linux-musl": "x86_64-linux bit-64",
109 "x86_64-linux-uclibc": "bit-64",
110 "x86_64-elf": "bit-64", 102 "x86_64-elf": "bit-64",
111 "x86_64-linux-gnu": "bit-64 x86_64-linux", 103 "x86_64-linux-gnu": "bit-64 x86_64-linux",
112 "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux", 104 "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux",
diff --git a/meta/recipes-bsp/pciutils/pciutils/configure.patch b/meta/recipes-bsp/pciutils/pciutils/configure.patch
index 66c9f91630..c87b3500f2 100644
--- a/meta/recipes-bsp/pciutils/pciutils/configure.patch
+++ b/meta/recipes-bsp/pciutils/pciutils/configure.patch
@@ -80,7 +80,7 @@ diff -r af2b10cc3c14 lib/configure
80 fi 80 fi
81 [ -n "$RELEASE" ] && rel="${RELEASE}" 81 [ -n "$RELEASE" ] && rel="${RELEASE}"
82 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless. 82 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
83@@ -49,6 +53,21 @@ 83@@ -49,6 +53,11 @@
84 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 84 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
85 echo " $host $rel $cpu $sys" 85 echo " $host $rel $cpu $sys"
86 86
@@ -89,16 +89,6 @@ diff -r af2b10cc3c14 lib/configure
89+ sys=linux 89+ sys=linux
90+fi 90+fi
91+ 91+
92+if [ "$host" = "linux--uclibc" ]
93+then
94+ sys=linux
95+fi
96+
97+if [ "$host" = "linux--uclibceabi" ]
98+then
99+ sys=linux
100+fi
101+
102 c=config.h 92 c=config.h
103 m=config.mk 93 m=config.mk
104 echo >$c '#define PCI_CONFIG_H' 94 echo >$c '#define PCI_CONFIG_H'
diff --git a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
index 540b4a0d13..f918e3bdc3 100644
--- a/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
+++ b/meta/recipes-bsp/pciutils/pciutils/guess-fix.patch
@@ -13,7 +13,7 @@ diff --git a/lib/configure b/lib/configure
13index 4318b05..84f6acb 100755 13index 4318b05..84f6acb 100755
14--- a/lib/configure 14--- a/lib/configure
15+++ b/lib/configure 15+++ b/lib/configure
16@@ -53,20 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` 16@@ -53,10 +53,7 @@ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
17 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` 17 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
18 echo " $host $rel $cpu $sys" 18 echo " $host $rel $cpu $sys"
19 19
@@ -21,16 +21,6 @@ index 4318b05..84f6acb 100755
21-then 21-then
22- sys=linux 22- sys=linux
23-fi 23-fi
24-
25-if [ "$host" = "linux--uclibc" ]
26-then
27- sys=linux
28-fi
29-
30-if [ "$host" = "linux--uclibceabi" ]
31-then
32- sys=linux
33-fi
34+{ echo "$host" | grep linux; } && sys=linux 24+{ echo "$host" | grep linux; } && sys=linux
35 25
36 c=config.h 26 c=config.h
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 8f2a797b89..3980ec2f44 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -64,10 +64,7 @@ do_configure () {
64 64
65 os=${HOST_OS} 65 os=${HOST_OS}
66 case $os in 66 case $os in
67 linux-uclibc |\
68 linux-uclibceabi |\
69 linux-gnueabi |\ 67 linux-gnueabi |\
70 linux-uclibcspe |\
71 linux-gnuspe |\ 68 linux-gnuspe |\
72 linux-musl*) 69 linux-musl*)
73 os=linux 70 os=linux
diff --git a/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch b/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch
index 613dc7b71c..f357b3f59f 100644
--- a/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch
+++ b/meta/recipes-connectivity/openssl/openssl/configure-musl-target.patch
@@ -16,10 +16,8 @@ Index: openssl-1.0.2a/Configure
16 "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 16 "linux-aarch64","gcc: -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
17 # Configure script adds minimally required -march for assembly support, 17 # Configure script adds minimally required -march for assembly support,
18 # if no -march was specified at command line. mips32 and mips64 below 18 # if no -march was specified at command line. mips32 and mips64 below
19@@ -504,6 +504,8 @@ my %table=( 19@@ -504,4 +504,6 @@ my %table=(
20 "linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 20 "linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
21 "linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
22 "linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
23+"linux-musleabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 21+"linux-musleabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
24+"linux-musleabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 22+"linux-musleabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
25 23
diff --git a/meta/recipes-connectivity/openssl/openssl/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl/configure-targets.patch
index 691e74afbd..1e01589722 100644
--- a/meta/recipes-connectivity/openssl/openssl/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl/configure-targets.patch
@@ -11,7 +11,7 @@ Index: openssl-1.0.2a/Configure
11=================================================================== 11===================================================================
12--- openssl-1.0.2a.orig/Configure 12--- openssl-1.0.2a.orig/Configure
13+++ openssl-1.0.2a/Configure 13+++ openssl-1.0.2a/Configure
14@@ -443,6 +443,23 @@ my %table=( 14@@ -443,6 +443,21 @@ my %table=(
15 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", 15 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
16 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", 16 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
17 17
@@ -21,8 +21,6 @@ Index: openssl-1.0.2a/Configure
21+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 21+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
22+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 22+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
23+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 23+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
24+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
25+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
26+ 24+
27+"linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).", 25+"linux-avr32","$ENV{'CC'}:-O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
28+ 26+
diff --git a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
deleted file mode 100644
index 43a0d3f616..0000000000
--- a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 82d837b76618a773485b96e38b7b91083a7437e8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 20 Feb 2015 05:05:45 +0000
4Subject: [PATCH 06/19] configure: Check for additional features that uclibc
5 doesnt support
6
7This helps in supporting uclibc which does not have all features that
8glibc might have
9
10Upstream-Status: Denied [no desire for uclibc support]
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 configure.ac | 18 ++++++++++++++++++
15 1 file changed, 18 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index 7f6b3b9..7c4b5a2 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]
22
23 AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
24
25+# check for few functions not implemented in uClibc
26+
27+AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate)
28+
29+# check for %ms format support - assume always no if cross compiling
30+
31+AC_MSG_CHECKING([whether %ms format is supported by *scanf])
32+
33+AC_LINK_IFELSE(
34+ [AC_LANG_PROGRAM([
35+ #include <stdio.h>
36+ ],[
37+ char *buf1, *buf2, *buf3, str="1 2.3 abcde" ;
38+ int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ;
39+ return (rc==3)?0:1;])],
40+ [AC_DEFINE([HAVE_MSFORMAT], [1], [Define if %ms format is supported by *scanf.])],
41+ [AC_MSG_RESULT([no])])
42+
43 M4_DEFINES=
44
45 AC_CHECK_TOOL(OBJCOPY, objcopy)
46--
472.10.2
48
diff --git a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
index fad69a51af..bc92db7468 100644
--- a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
12 configure.ac | 2 -- 12 configure.ac | 2 --
13 2 files changed, 1 insertion(+), 3 deletions(-) 13 2 files changed, 1 insertion(+), 3 deletions(-)
14 14
15diff --git a/Makefile.am b/Makefile.am 15Index: git/Makefile.am
16index 29ed1dd..02f4017 100644 16===================================================================
17--- a/Makefile.am 17--- git.orig/Makefile.am
18+++ b/Makefile.am 18+++ git/Makefile.am
19@@ -320,7 +320,7 @@ define install-relative-aliases 19@@ -320,7 +320,7 @@ define install-relative-aliases
20 while [ -n "$$1" ]; do \ 20 while [ -n "$$1" ]; do \
21 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ 21 $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
@@ -25,19 +25,16 @@ index 29ed1dd..02f4017 100644
25 shift 2 || exit $$?; \ 25 shift 2 || exit $$?; \
26 done 26 done
27 endef 27 endef
28diff --git a/configure.ac b/configure.ac 28Index: git/configure.ac
29index 7c4b5a2..b10c952 100644 29===================================================================
30--- a/configure.ac 30--- git.orig/configure.ac
31+++ b/configure.ac 31+++ git/configure.ac
32@@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) 32@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
33 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) 33 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
34 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) 34 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
35 35
36-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) 36-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
37- 37-
38 # check for few functions not implemented in uClibc 38 M4_DEFINES=
39 39
40 AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) 40 AC_CHECK_TOOL(OBJCOPY, objcopy)
41--
422.10.2
43
diff --git a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
deleted file mode 100644
index 586b5aab7d..0000000000
--- a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 96026a3763264eb41a2c3e374f232f6e543284a8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Nov 2016 19:33:49 -0800
4Subject: [PATCH 08/19] nspawn: Use execvpe only when libc supports it
5
6Upstream-Status: Denied [no desire for uclibc support]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 src/nspawn/nspawn.c | 7 +++++++
11 1 file changed, 7 insertions(+)
12
13diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
14index 9b9ae90..19b47cd 100644
15--- a/src/nspawn/nspawn.c
16+++ b/src/nspawn/nspawn.c
17@@ -123,6 +123,8 @@ typedef enum LinkJournal {
18 LINK_GUEST
19 } LinkJournal;
20
21+#include "config.h"
22+
23 static char *arg_directory = NULL;
24 static char *arg_template = NULL;
25 static char *arg_chdir = NULL;
26@@ -2871,7 +2873,12 @@ static int inner_child(
27 a[0] = (char*) "/sbin/init";
28 execve(a[0], a, env_use);
29 } else if (!strv_isempty(arg_parameters))
30+#ifdef HAVE_EXECVPE
31 execvpe(arg_parameters[0], arg_parameters, env_use);
32+#else
33+ environ = env_use;
34+ execvp(arg_parameters[0], arg_parameters);
35+#endif /* HAVE_EXECVPE */
36 else {
37 if (!arg_chdir)
38 /* If we cannot change the directory, we'll end up in /, that is expected. */
39--
402.10.2
41
diff --git a/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
deleted file mode 100644
index f150bb087a..0000000000
--- a/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 085c8b6f253726ad547e7be84ff3f2b99701488b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Nov 2016 19:38:07 -0800
4Subject: [PATCH 09/19] util: bypass unimplemented _SC_PHYS_PAGES system
5 configuration API on uclibc
6
7Upstream-Status: Inappropriate [uclibc-specific]
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/basic/util.c | 15 +++++++++++++++
12 1 file changed, 15 insertions(+)
13
14diff --git a/src/basic/util.c b/src/basic/util.c
15index c1b5ca1..4c62d43 100644
16--- a/src/basic/util.c
17+++ b/src/basic/util.c
18@@ -742,6 +742,20 @@ uint64_t physical_memory(void) {
19 * In order to support containers nicely that have a configured memory limit we'll take the minimum of the
20 * physically reported amount of memory and the limit configured for the root cgroup, if there is any. */
21
22+#ifdef __UCLIBC__
23+ char line[128];
24+ FILE *f = fopen("/proc/meminfo", "r");
25+ if (f == NULL)
26+ return 0;
27+ while (!feof(f) && fgets(line, sizeof(line)-1, f)) {
28+ if (sscanf(line, "MemTotal: %li kB", &mem) == 1) {
29+ mem *= 1024;
30+ break;
31+ }
32+ }
33+ fclose(f);
34+ return (uint64_t) mem;
35+#else
36 sc = sysconf(_SC_PHYS_PAGES);
37 assert(sc > 0);
38
39@@ -762,6 +776,7 @@ uint64_t physical_memory(void) {
40 lim *= ps;
41
42 return MIN(mem, lim);
43+#endif
44 }
45
46 uint64_t physical_memory_scale(uint64_t v, uint64_t max) {
47--
482.10.2
49
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index a6e6401da7..d54e92707f 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -18,10 +18,7 @@ SRC_URI += " \
18 file://0003-define-exp10-if-missing.patch \ 18 file://0003-define-exp10-if-missing.patch \
19 file://0004-Use-getenv-when-secure-versions-are-not-available.patch \ 19 file://0004-Use-getenv-when-secure-versions-are-not-available.patch \
20 file://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ 20 file://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
21 file://0006-configure-Check-for-additional-features-that-uclibc-.patch \
22 file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ 21 file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \
23 file://0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch \
24 file://0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \
25 file://0010-implment-systemd-sysv-install-for-OE.patch \ 22 file://0010-implment-systemd-sysv-install-for-OE.patch \
26 file://0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \ 23 file://0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
27 file://0012-rules-whitelist-hd-devices.patch \ 24 file://0012-rules-whitelist-hd-devices.patch \
diff --git a/meta/recipes-devtools/binutils/binutils-2.28.inc b/meta/recipes-devtools/binutils/binutils-2.28.inc
index b37bb0e03a..47bfa1aa98 100644
--- a/meta/recipes-devtools/binutils/binutils-2.28.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.28.inc
@@ -21,10 +21,8 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
21SRCREV = "cb44d42ce6ef0c7a4eed7e2a3c272ac102166850" 21SRCREV = "cb44d42ce6ef0c7a4eed7e2a3c272ac102166850"
22SRC_URI = "\ 22SRC_URI = "\
23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \ 23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
24 file://0003-gprof-add-uclibc-support-to-configure.patch \
25 file://0004-Point-scripts-location-to-libdir.patch \ 24 file://0004-Point-scripts-location-to-libdir.patch \
26 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 25 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
27 file://0006-Explicitly-link-with-libm-on-uclibc.patch \
28 file://0007-Use-libtool-2.4.patch \ 26 file://0007-Use-libtool-2.4.patch \
29 file://0008-Add-the-armv5e-architecture-to-binutils.patch \ 27 file://0008-Add-the-armv5e-architecture-to-binutils.patch \
30 file://0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ 28 file://0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
diff --git a/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch b/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch
deleted file mode 100644
index eddb42b4e3..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 7893d2b24d0303bda3a0049846489619ffd1387b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH 03/15] gprof: add uclibc support to configure
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 gprof/configure | 5 +++++
11 1 file changed, 5 insertions(+)
12
13diff --git a/gprof/configure b/gprof/configure
14index 9e6b8f3525..38a4c0b0e5 100755
15--- a/gprof/configure
16+++ b/gprof/configure
17@@ -5874,6 +5874,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
18 lt_cv_deplibs_check_method=pass_all
19 ;;
20
21+linux-uclibc*)
22+ lt_cv_deplibs_check_method=pass_all
23+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
24+ ;;
25+
26 netbsd*)
27 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
28 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
29--
302.12.0
31
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch b/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch
deleted file mode 100644
index 9770ca7f0f..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 6a46bf151d7e53df8b5e7645a2d241967688368a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:32:49 +0000
4Subject: [PATCH 06/15] Explicitly link with libm on uclibc
5
6Description:
7
8We do not need to have the libtool patch anymore for binutils after
9libtool has been updated upstream it include support for it. However
10for building gas natively on uclibc systems we have to link it with
11-lm so that it picks up missing symbols.
12
13/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
14In function `floatformat_from_double':
15floatformat.c:(.text+0x1ec): undefined reference to `frexp'
16floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
17/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
18In function `floatformat_to_double':
19floatformat.c:(.text+0x38a): undefined reference to `ldexp'
20floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
21floatformat.c:(.text+0x43e): undefined reference to `ldexp'
22floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
23collect2: ld returned 1 exit status
24make[4]: *** [as-new] Error 1
25
26Upstream-Status: Pending
27
28Signed-off-by: Khem Raj <raj.khem@gmail.com>
29---
30 gas/configure.tgt | 6 ++++++
31 1 file changed, 6 insertions(+)
32
33diff --git a/gas/configure.tgt b/gas/configure.tgt
34index 711d537e95..7cd2dc176a 100644
35--- a/gas/configure.tgt
36+++ b/gas/configure.tgt
37@@ -494,6 +494,12 @@ case ${generic_target} in
38 *-*-netware) fmt=elf em=netware ;;
39 esac
40
41+case ${generic_target} in
42+ arm-*-*uclibc*)
43+ need_libm=yes
44+ ;;
45+esac
46+
47 case ${cpu_type} in
48 aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | riscv | sparc | z80 | z8k)
49 bfd_gas=yes
50--
512.12.0
52
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
index 6b7f753891..4f0ef101db 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
@@ -5894,18 +5894,6 @@ index 38a4c0b0e5..38d1f699c7 100755
5894 lt_cv_file_magic_cmd='$OBJDUMP -f' 5894 lt_cv_file_magic_cmd='$OBJDUMP -f'
5895 fi 5895 fi
5896 ;; 5896 ;;
5897@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5898 lt_cv_deplibs_check_method=pass_all
5899 ;;
5900
5901-linux-uclibc*)
5902- lt_cv_deplibs_check_method=pass_all
5903- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5904- ;;
5905-
5906 netbsd*)
5907 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5908 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5909@@ -5956,6 +6037,21 @@ esac 5897@@ -5956,6 +6037,21 @@ esac
5910 fi 5898 fi
5911 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5899 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 18dc3a6ca6..3d484efa41 100644
--- a/meta/recipes-devtools/gcc/gcc-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-common.inc
@@ -41,7 +41,7 @@ def get_gcc_ppc_plt_settings(bb, d):
41 return "" 41 return ""
42 42
43def get_long_double_setting(bb, d): 43def get_long_double_setting(bb, d):
44 if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'uclibc', 'glibc' ]: 44 if d.getVar('TRANSLATED_TARGET_ARCH') in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC') in [ 'glibc' ]:
45 return "--with-long-double-128" 45 return "--with-long-double-128"
46 else: 46 else:
47 return "--without-long-double-128" 47 return "--without-long-double-128"
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 8430ae0d3c..ee08529a5f 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -101,8 +101,8 @@ do_install_append_class-target () {
101 101
102 if [ "${TCLIBC}" != "glibc" ]; then 102 if [ "${TCLIBC}" != "glibc" ]; then
103 case "${TARGET_OS}" in 103 case "${TARGET_OS}" in
104 "linux-musl" | "linux-uclibc" | "linux-*spe") extra_target_os="linux";; 104 "linux-musl" | "linux-*spe") extra_target_os="linux";;
105 "linux-musleabi" | "linux-uclibceabi") extra_target_os="linux-gnueabi";; 105 "linux-musleabi") extra_target_os="linux-gnueabi";;
106 *) extra_target_os="linux";; 106 *) extra_target_os="linux";;
107 esac 107 esac
108 ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os 108 ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc
index 38d1643a9c..1500fb5ace 100644
--- a/meta/recipes-devtools/gcc/libgcc.inc
+++ b/meta/recipes-devtools/gcc/libgcc.inc
@@ -5,8 +5,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
5do_install_append_class-target () { 5do_install_append_class-target () {
6 if [ "${TCLIBC}" != "glibc" ]; then 6 if [ "${TCLIBC}" != "glibc" ]; then
7 case "${TARGET_OS}" in 7 case "${TARGET_OS}" in
8 "linux-musl" | "linux-uclibc" | "linux-*spe") extra_target_os="linux";; 8 "linux-musl" | "linux-*spe") extra_target_os="linux";;
9 "linux-musleabi" | "linux-uclibceabi") extra_target_os="linux-gnueabi";; 9 "linux-musleabi") extra_target_os="linux-gnueabi";;
10 *) extra_target_os="linux";; 10 *) extra_target_os="linux";;
11 esac 11 esac
12 ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os 12 ln -s ${TARGET_SYS} ${D}${libdir}/${TARGET_ARCH}${TARGET_VENDOR}-$extra_target_os
diff --git a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
deleted file mode 100644
index 96b023a468..0000000000
--- a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 81b0f04c14f673b99778d2e7d8e85461e0bf2018 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com>
3Date: Fri, 25 Apr 2014 13:58:55 +0300
4Subject: [PATCH 1/3] Correct rpl_gettimeofday signature
5
6Currently we fail on uclibc like below
7
8| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,
9| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
10| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
11| from ../../gl/signal.h:52,
12| from ../../gl/sys/select.h:58,
13| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
14| from ../../gl/sys/types.h:28,
15| from ../../lib/includes/gnutls/gnutls.h:46,
16| from ex-cxx.cpp:3:
17| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
18| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
19| make[4]: *** [ex-cxx.o] Error 1
20| make[4]: *** Waiting for unfinished jobs....
21
22GCC detects that we call 'restrict' as param name in function
23signatures and complains since both params are called 'restrict'
24therefore we use __restrict to denote the C99 keywork
25
26This only happens of uclibc since this code is not excercised with
27eglibc otherwise we will have same issue there too
28
29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30
31Upstream-Status: Pending
32
33---
34 gl/sys_time.in.h | 8 ++++----
35 1 file changed, 4 insertions(+), 4 deletions(-)
36
37diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h
38index 5a8caf3..2dc5718 100644
39--- a/gl/sys_time.in.h
40+++ b/gl/sys_time.in.h
41@@ -93,20 +93,20 @@ struct timeval
42 # define gettimeofday rpl_gettimeofday
43 # endif
44 _GL_FUNCDECL_RPL (gettimeofday, int,
45- (struct timeval *restrict, void *restrict)
46+ (struct timeval *__restrict, void *__restrict)
47 _GL_ARG_NONNULL ((1)));
48 _GL_CXXALIAS_RPL (gettimeofday, int,
49- (struct timeval *restrict, void *restrict));
50+ (struct timeval *__restrict, void *__restrict));
51 # else
52 # if !@HAVE_GETTIMEOFDAY@
53 _GL_FUNCDECL_SYS (gettimeofday, int,
54- (struct timeval *restrict, void *restrict)
55+ (struct timeval *__restrict, void *__restrict)
56 _GL_ARG_NONNULL ((1)));
57 # endif
58 /* Need to cast, because on glibc systems, by default, the second argument is
59 struct timezone *. */
60 _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
61- (struct timeval *restrict, void *restrict));
62+ (struct timeval *__restrict, void *__restrict));
63 # endif
64 _GL_CXXALIASWARN (gettimeofday);
65 # if defined __cplusplus && defined GNULIB_NAMESPACE
66--
672.10.2
68
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.13.bb b/meta/recipes-support/gnutls/gnutls_3.5.13.bb
index 11155007e5..35d7d09c83 100644
--- a/meta/recipes-support/gnutls/gnutls_3.5.13.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.5.13.bb
@@ -1,7 +1,6 @@
1require gnutls.inc 1require gnutls.inc
2 2
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \ 3SRC_URI += "file://0001-configure.ac-fix-sed-command.patch \
4 file://0001-configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \ 4 file://use-pkg-config-to-locate-zlib.patch \
6 file://arm_eabi.patch \ 5 file://arm_eabi.patch \
7 " 6 "
diff --git a/meta/site/arm-linux-uclibc b/meta/site/arm-linux-uclibc
deleted file mode 100644
index 6ae7c6e09d..0000000000
--- a/meta/site/arm-linux-uclibc
+++ /dev/null
@@ -1,105 +0,0 @@
1ac_cv_func_setvbuf_reversed=no
2ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
3ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
4ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
5ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
6ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4}
7ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
8ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
9ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
10ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
11ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
12ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
13
14ac_cv_uchar=${ac_cv_uchar=no}
15ac_cv_uint=${ac_cv_uint=yes}
16ac_cv_ulong=${ac_cv_ulong=yes}
17ac_cv_ushort=${ac_cv_ushort=yes}
18
19ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
20
21# samba
22samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=yes}
23samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=${samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no}
24samba_cv_FTRUNCATE_NEEDS_ROOT=${samba_cv_FTRUNCATE_NEEDS_ROOT=no}
25samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no}
26samba_cv_HAVE_BROKEN_GETGROUPS=${samba_cv_HAVE_BROKEN_GETGROUPS=no}
27samba_cv_HAVE_BROKEN_LINUX_SENDFILE=${samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes}
28samba_cv_HAVE_BROKEN_READDIR=${samba_cv_HAVE_BROKEN_READDIR=no}
29samba_cv_HAVE_C99_VSNPRINTF=${samba_cv_HAVE_C99_VSNPRINTF=yes}
30samba_cv_HAVE_DEV64_T=${samba_cv_HAVE_DEV64_T=no}
31samba_cv_HAVE_DEVICE_MAJOR_FN=${samba_cv_HAVE_DEVICE_MAJOR_FN=yes}
32samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes}
33samba_cv_HAVE_DQB_FSOFTLIMIT=${samba_cv_HAVE_DQB_FSOFTLIMIT=no}
34samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes}
35samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
36samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
37samba_cv_HAVE_FUNCTION_MACRO=${samba_cv_HAVE_FUNCTION_MACRO=yes}
38samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
39samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
40samba_cv_HAVE_INT16_FROM_RPC_RPC_H=${samba_cv_HAVE_INT16_FROM_RPC_RPC_H=no}
41samba_cv_HAVE_INT32_FROM_RPC_RPC_H=${samba_cv_HAVE_INT32_FROM_RPC_RPC_H=no}
42samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
43samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
44samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
45samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes}
46samba_cv_HAVE_NATIVE_ICONV=${samba_cv_HAVE_NATIVE_ICONV=yes}
47samba_cv_HAVE_OFF64_T=${samba_cv_HAVE_OFF64_T=no}
48samba_cv_HAVE_QUOTACTL_4A=${samba_cv_HAVE_QUOTACTL_4A=yes}
49samba_cv_HAVE_ROOT=${samba_cv_HAVE_ROOT=no}
50samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=${samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no}
51samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes}
52samba_cv_HAVE_SENDFILE=${samba_cv_HAVE_SENDFILE=no}
53samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=no}
54samba_cv_HAVE_SOCK_SIN_LEN=${samba_cv_HAVE_SOCK_SIN_LEN=no}
55samba_cv_HAVE_STAT_ST_BLKSIZE=${samba_cv_HAVE_STAT_ST_BLKSIZE=yes}
56samba_cv_HAVE_STAT_ST_BLOCKS=${samba_cv_HAVE_STAT_ST_BLOCKS=yes}
57samba_cv_HAVE_STRUCT_DIRENT64=${samba_cv_HAVE_STRUCT_DIRENT64=no}
58samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
59samba_cv_HAVE_STRUCT_IF_DQBLK=${samba_cv_HAVE_STRUCT_IF_DQBLK=no}
60samba_cv_HAVE_STRUCT_MEM_DQBLK=${samba_cv_HAVE_STRUCT_MEM_DQBLK=no}
61samba_cv_HAVE_TRUNCATED_SALT=${samba_cv_HAVE_TRUNCATED_SALT=no}
62samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=no}
63samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=no}
64samba_cv_HAVE_UNSIGNED_CHAR=${samba_cv_HAVE_UNSIGNED_CHAR=yes}
65samba_cv_HAVE_UTIMBUF=${samba_cv_HAVE_UTIMBUF=yes}
66samba_cv_HAVE_UT_UT_ADDR=${samba_cv_HAVE_UT_UT_ADDR=yes}
67samba_cv_HAVE_UT_UT_EXIT=${samba_cv_HAVE_UT_UT_EXIT=yes}
68samba_cv_HAVE_UT_UT_HOST=${samba_cv_HAVE_UT_UT_HOST=yes}
69samba_cv_HAVE_UT_UT_ID=${samba_cv_HAVE_UT_UT_ID=yes}
70samba_cv_HAVE_UT_UT_NAME=${samba_cv_HAVE_UT_UT_NAME=yes}
71samba_cv_HAVE_UT_UT_PID=${samba_cv_HAVE_UT_UT_PID=yes}
72samba_cv_HAVE_UT_UT_TIME=${samba_cv_HAVE_UT_UT_TIME=yes}
73samba_cv_HAVE_UT_UT_TV=${samba_cv_HAVE_UT_UT_TV=yes}
74samba_cv_HAVE_UT_UT_TYPE=${samba_cv_HAVE_UT_UT_TYPE=yes}
75samba_cv_HAVE_UT_UT_USER=${samba_cv_HAVE_UT_UT_USER=yes}
76samba_cv_HAVE_UX_UT_SYSLEN=${samba_cv_HAVE_UX_UT_SYSLEN=no}
77samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes}
78samba_cv_HAVE_WORKING_AF_LOCAL=${samba_cv_HAVE_WORKING_AF_LOCAL=no}
79samba_cv_HAVE_Werror=${samba_cv_HAVE_Werror=yes}
80samba_cv_PUTUTLINE_RETURNS_UTMP=${samba_cv_PUTUTLINE_RETURNS_UTMP=yes}
81samba_cv_QUOTA_WORKS=${samba_cv_QUOTA_WORKS=yes}
82samba_cv_REPLACE_GETPASS=${samba_cv_REPLACE_GETPASS=yes}
83samba_cv_REPLACE_INET_NTOA=${samba_cv_REPLACE_INET_NTOA=no}
84samba_cv_RUN_QUOTA_TESTS=${samba_cv_RUN_QUOTA_TESTS=auto}
85samba_cv_SEEKDIR_RETURNS_VOID=${samba_cv_SEEKDIR_RETURNS_VOID=yes}
86samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
87samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
88samba_cv_SYSCONF_SC_NGROUPS_MAX=${samba_cv_SYSCONF_SC_NGROUPS_MAX=yes}
89samba_cv_SYSQUOTA_FOUND=${samba_cv_SYSQUOTA_FOUND=yes}
90samba_cv_SYSQUOTA_WORKS=${samba_cv_SYSQUOTA_WORKS=yes}
91samba_cv_TRY_QUOTAS=${samba_cv_TRY_QUOTAS=no}
92samba_cv_TRY_SYS_QUOTAS=${samba_cv_TRY_SYS_QUOTAS=no}
93samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
94samba_cv_WITH_QUOTAS=${samba_cv_WITH_QUOTAS=auto}
95samba_cv_WITH_SYS_QUOTAS=${samba_cv_WITH_SYS_QUOTAS=auto}
96samba_cv_compiler_supports_ll=${samba_cv_compiler_supports_ll=yes}
97samba_cv_have_longlong=${samba_cv_have_longlong=yes}
98samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
99samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
100samba_cv_immediate_structures=${samba_cv_immediate_structures=yes}
101samba_cv_optimize_out_funcation_calls=${samba_cv_optimize_out_funcation_calls=yes}
102samba_cv_sig_atomic_t=${samba_cv_sig_atomic_t=yes}
103samba_cv_socklen_t=${samba_cv_socklen_t=yes}
104samba_cv_unixsocket=${samba_cv_unixsocket=yes}
105samba_cv_volatile=${samba_cv_volatile=yes}
diff --git a/meta/site/armeb-linux-uclibc b/meta/site/armeb-linux-uclibc
deleted file mode 100644
index 731e857dc2..0000000000
--- a/meta/site/armeb-linux-uclibc
+++ /dev/null
@@ -1,38 +0,0 @@
1ac_cv_func_setvbuf_reversed=no
2ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
3ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
4ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
5ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
6ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4}
7ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
8ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
9ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
10ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
11ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
12ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
13ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
14ac_cv_sizeof_unsigned=${ac_cv_sizeof_unsigned=4}
15ac_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4}
16
17ac_cv_uchar=${ac_cv_uchar=no}
18ac_cv_uint=${ac_cv_uint=yes}
19ac_cv_ulong=${ac_cv_ulong=yes}
20ac_cv_ushort=${ac_cv_ushort=yes}
21
22ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
23
24# samba
25samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
26samba_cv_USE_SETEUID=${samba_cv_USE_SETEUID=yes}
27samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
28samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
29samba_cv_USE_SETUIDX=${samba_cv_USE_SETUIDX=yes}
30samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
31samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
32samba_cv_HAVE_SENDFILE=${samba_cv_HAVE_SENDFILE=yes}
33samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes}
34samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes}
35samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes}
36samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
37samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
38samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
diff --git a/meta/site/common-uclibc b/meta/site/common-uclibc
deleted file mode 100644
index 26fc103319..0000000000
--- a/meta/site/common-uclibc
+++ /dev/null
@@ -1,52 +0,0 @@
1# general
2ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=no}
3ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes}
4ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
5ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes}
6ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
7ac_cv_func_getpgrp_void=yes
8ac_cv_func_setpgrp_void=yes
9ac_cv_func_setgrent_void=yes
10ac_cv_func_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
11ac_cv_func_getpwuid_r=${ac_cv_func_getpwuid_r=yes}
12ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
13ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
14ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
15
16# glib
17glib_cv_strlcpy=${glib_cv_strlcpy=no}
18ac_cv_func_printf_unix98=${ac_cv_func_printf_unix98=yes}
19ac_cv_func_snprintf_c99=${ac_cv_func_snprintf_c99=yes}
20ac_cv_func_vsnprintf_c99=${ac_cv_func_vsnprintf_c99=yes}
21glib_cv_compliant_posix_memalign=${glib_cv_compliant_posix_memalign=1}
22glib_cv_long_long_format=${glib_cv_long_long_format=ll}
23glib_cv_have_qsort_r=${glib_cv_have_qsort_r=no}
24
25#dbus-glib
26ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes}
27
28# bash
29bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=no}
30bash_cv_sys_siglist=${bash_cv_sys_siglist=no}
31
32# coreutils
33fu_cv_sys_stat_statfs2_bsize=${fu_cv_sys_stat_statfs2_bsize=yes}
34gl_cv_func_gettimeofday_clobber=${gl_cv_func_gettimeofday_clobber=no}
35gl_cv_func_tzset_clobber=${gl_cv_func_tzset_clobber=no}
36gl_cv_func_gettimeofday_posix_signature=${gl_cv_func_gettimeofday_posix_signature=yes}
37ac_cv_func_posix_spawn=${ac_cv_func_posix_spawn=yes}
38ac_cv_func_posix_spawn_works=${ac_cv_func_posix_spawn_works=yes}
39
40# va_copy and _va_copy
41ac_cv_va_copy=${ac_cv_va_copy=yes}
42ac_cv___va_copy=${ac_cv___va_copy=yes}
43ac_cv_func_va_copy=${ac_cv_func_va_copy=yes}
44ac_cv_func___va_copy=${ac_cv_func___va_copy=yes}
45
46# posix_getpwuid_r posix_getgrgid_r posix_getpwnam_r
47ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
48ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
49ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
50
51# Xorg
52xorg_cv_malloc0_returns_null=${xorg_cv_malloc0_returns_null=yes}
diff --git a/meta/site/mips-linux-uclibc b/meta/site/mips-linux-uclibc
deleted file mode 100644
index b23363e156..0000000000
--- a/meta/site/mips-linux-uclibc
+++ /dev/null
@@ -1,80 +0,0 @@
1# general
2ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
3
4# bash
5ac_cv_c_long_double=${ac_cv_c_long_double=no}
6bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
7
8# openssh
9ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
10ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
11ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
12ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no}
13ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes}
14
15# fget
16compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
17
18# glib
19glib_cv___va_copy=${glib_cv___va_copy=yes}
20glib_cv_has__inline=${glib_cv_has__inline=yes}
21glib_cv_has__inline__=${glib_cv_has__inline__=yes}
22glib_cv_hasinline=${glib_cv_hasinline=yes}
23glib_cv_long_long_format=${glib_cv_long_long_format=ll}
24glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
25glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
26glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
27glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
28glib_cv_stack_grows=${glib_cv_stack_grows=no}
29glib_cv_uscore=${glib_cv_uscore=no}
30
31# glib-2.0
32glib_cv_stack_grows=${glib_cv_stack_grows=no}
33utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
34glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
35
36# libpcap
37ac_cv_linux_vers=${ac_cv_linux_vers=2}
38
39# startup-notification
40lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
41
42# libidl
43libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
44
45# ncftp
46wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
47wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
48wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
49
50# db
51db_cv_align_t=${db_cv_align_t='unsigned long long'}
52db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
53db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
54db_cv_sprintf_count=${db_cv_sprintf_count=yes}
55
56# rrdtool
57rd_cv_ieee_works=${rd_cv_ieee_works=yes}
58# ac_cv_path_PERL=${ac_cv_path_PERL=no}
59
60# gettext
61am_cv_func_working_getline=${am_cv_func_working_getline=yes}
62
63# samba
64samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
65
66# vim
67ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
68
69# intercom
70ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
71
72# lmbench
73ac_cv_uint=${ac_cv_unit=yes}
74
75# D-BUS
76ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
77
78# evolution-data-server
79ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
80
diff --git a/meta/site/mips64-linux-uclibc b/meta/site/mips64-linux-uclibc
deleted file mode 100644
index cbba5525fa..0000000000
--- a/meta/site/mips64-linux-uclibc
+++ /dev/null
@@ -1,83 +0,0 @@
1# general
2ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
3
4# bash
5ac_cv_c_long_double=${ac_cv_c_long_double=no}
6bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
7
8# openssh
9ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
10ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
11ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
12ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no}
13ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes}
14
15# fget
16compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
17
18# glib
19glib_cv___va_copy=${glib_cv___va_copy=yes}
20glib_cv_has__inline=${glib_cv_has__inline=yes}
21glib_cv_has__inline__=${glib_cv_has__inline__=yes}
22glib_cv_hasinline=${glib_cv_hasinline=yes}
23glib_cv_long_long_format=${glib_cv_long_long_format=ll}
24glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
25glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
26glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
27glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
28glib_cv_stack_grows=${glib_cv_stack_grows=no}
29glib_cv_uscore=${glib_cv_uscore=no}
30
31# glib-2.0
32glib_cv_stack_grows=${glib_cv_stack_grows=no}
33utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
34glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
35ac_cv_alignof_guint32=4
36ac_cv_alignof_guint64=8
37ac_cv_alignof_unsigned_long=8
38
39# libpcap
40ac_cv_linux_vers=${ac_cv_linux_vers=2}
41
42# startup-notification
43lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
44
45# libidl
46libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
47
48# ncftp
49wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
50wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
51wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
52
53# db
54db_cv_align_t=${db_cv_align_t='unsigned long long'}
55db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
56db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
57db_cv_sprintf_count=${db_cv_sprintf_count=yes}
58
59# rrdtool
60rd_cv_ieee_works=${rd_cv_ieee_works=yes}
61# ac_cv_path_PERL=${ac_cv_path_PERL=no}
62
63# gettext
64am_cv_func_working_getline=${am_cv_func_working_getline=yes}
65
66# samba
67samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
68
69# vim
70ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
71
72# intercom
73ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
74
75# lmbench
76ac_cv_uint=${ac_cv_unit=yes}
77
78# D-BUS
79ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
80
81# eds-dbus
82ac_cv_libiconv_utf8=${ac_cv_libiconv_utf8=yes}
83
diff --git a/meta/site/mips64el-linux-uclibc b/meta/site/mips64el-linux-uclibc
deleted file mode 100644
index 6a0499d101..0000000000
--- a/meta/site/mips64el-linux-uclibc
+++ /dev/null
@@ -1,108 +0,0 @@
1# general
2ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
3
4# bash
5ac_cv_c_long_double=${ac_cv_c_long_double=no}
6bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
7
8# openssh
9ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
10ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
11ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
12ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no}
13ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes}
14
15# fget
16compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
17
18# glib
19glib_cv___va_copy=${glib_cv___va_copy=yes}
20glib_cv_has__inline=${glib_cv_has__inline=yes}
21glib_cv_has__inline__=${glib_cv_has__inline__=yes}
22glib_cv_hasinline=${glib_cv_hasinline=yes}
23glib_cv_long_long_format=${glib_cv_long_long_format=ll}
24glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
25glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
26glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
27glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
28glib_cv_stack_grows=${glib_cv_stack_grows=no}
29glib_cv_uscore=${glib_cv_uscore=no}
30
31# glib-2.0
32glib_cv_stack_grows=${glib_cv_stack_grows=no}
33utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
34glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
35ac_cv_alignof_guint32=4
36ac_cv_alignof_guint64=8
37ac_cv_alignof_unsigned_long=8
38
39# libpcap
40ac_cv_linux_vers=${ac_cv_linux_vers=2}
41
42# startup-notification
43lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
44
45# libidl
46libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
47
48# ncftp
49wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
50wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
51wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
52
53# gettext
54am_cv_func_working_getline=${am_cv_func_working_getline=yes}
55
56# samba
57# from samba 3.0.14a on 5/29/2005
58ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
59ac_cv_have_asprintf_decl=${ac_cv_have_asprintf_decl=yes}
60ac_cv_have_setresgid_decl=${ac_cv_have_setresgid_decl=yes}
61ac_cv_have_setresuid_decl=${ac_cv_have_setresuid_decl=yes}
62ac_cv_have_vasprintf_decl=${ac_cv_have_vasprintf_decl=yes}
63fu_cv_sys_stat_statvfs64=${fu_cv_sys_stat_statvfs64=yes}
64samba_cv_FTRUNCATE_NEEDS_ROOT=${samba_cv_FTRUNCATE_NEEDS_ROOT=no}
65samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no}
66samba_cv_HAVE_BROKEN_GETGROUPS=${samba_cv_HAVE_BROKEN_GETGROUPS=no}
67samba_cv_HAVE_BROKEN_READDIR=${samba_cv_HAVE_BROKEN_READDIR=no}
68samba_cv_HAVE_C99_VSNPRINTF=${samba_cv_HAVE_C99_VSNPRINTF=yes}
69samba_cv_HAVE_DEV64_T=${samba_cv_HAVE_DEV64_T=no}
70samba_cv_HAVE_DEVICE_MAJOR_FN=${samba_cv_HAVE_DEVICE_MAJOR_FN=yes}
71samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes}
72samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes}
73samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
74samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
75samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
76samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
77samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
78samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
79samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
80samba_cv_HAVE_MAKEDEV=${samba_cv_HAVE_MAKEDEV=yes}
81samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes}
82samba_cv_HAVE_OFF64_T=${samba_cv_HAVE_OFF64_T=no}
83samba_cv_HAVE_QUOTACTL_4A=${samba_cv_HAVE_QUOTACTL_4A=yes}
84samba_cv_HAVE_ROOT=${samba_cv_HAVE_ROOT=no}
85samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes}
86samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes}
87samba_cv_HAVE_STRUCT_DIRENT64=${samba_cv_HAVE_STRUCT_DIRENT64=yes}
88samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
89samba_cv_HAVE_TRUNCATED_SALT=${samba_cv_HAVE_TRUNCATED_SALT=no}
90samba_cv_HAVE_UNSIGNED_CHAR=${samba_cv_HAVE_UNSIGNED_CHAR=no}
91samba_cv_HAVE_WORKING_AF_LOCAL=${samba_cv_HAVE_WORKING_AF_LOCAL=no}
92samba_cv_HAVE_Werror=${samba_cv_HAVE_Werror=yes}
93samba_cv_REALPATH_TAKES_NULL=${samba_cv_REALPATH_TAKES_NULL=no}
94samba_cv_REPLACE_INET_NTOA=${samba_cv_REPLACE_INET_NTOA=no}
95samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
96samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
97samba_cv_SYSCONF_SC_NGROUPS_MAX=${samba_cv_SYSCONF_SC_NGROUPS_MAX=yes}
98samba_cv_SYSCONF_SC_NPROC_ONLN=${samba_cv_SYSCONF_SC_NPROC_ONLN=no}
99samba_cv_SYSQUOTA_FOUND=${samba_cv_SYSQUOTA_FOUND=yes}
100samba_cv_SYSQUOTA_WORKS=${samba_cv_SYSQUOTA_WORKS=yes}
101samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
102samba_cv_have_longlong=${samba_cv_have_longlong=yes}
103samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
104samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
105samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_4A.c}
106# This cached value needs a local patch to pick it up, upstream 3.0.14a
107# doesn't cache it.
108samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
diff --git a/meta/site/mipsel-linux-uclibc b/meta/site/mipsel-linux-uclibc
deleted file mode 100644
index f921cda4ae..0000000000
--- a/meta/site/mipsel-linux-uclibc
+++ /dev/null
@@ -1,100 +0,0 @@
1# general
2ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
3
4# bash
5ac_cv_c_long_double=${ac_cv_c_long_double=no}
6bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
7
8# openssh
9ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
10ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
11ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
12ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no}
13ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes}
14
15# fget
16compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
17
18# glib
19glib_cv___va_copy=${glib_cv___va_copy=yes}
20glib_cv_has__inline=${glib_cv_has__inline=yes}
21glib_cv_has__inline__=${glib_cv_has__inline__=yes}
22glib_cv_hasinline=${glib_cv_hasinline=yes}
23glib_cv_long_long_format=${glib_cv_long_long_format=ll}
24glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
25glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
26glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
27glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
28glib_cv_stack_grows=${glib_cv_stack_grows=no}
29glib_cv_uscore=${glib_cv_uscore=no}
30
31# libpcap
32ac_cv_linux_vers=${ac_cv_linux_vers=2}
33
34# startup-notification
35lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
36
37# libidl
38libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
39
40# ncftp
41wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
42wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
43wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
44
45# gettext
46am_cv_func_working_getline=${am_cv_func_working_getline=yes}
47
48# samba
49# from samba 3.0.14a on 5/29/2005
50ac_cv_func_memcmp_working=${ac_cv_func_memcmp_working=yes}
51ac_cv_have_asprintf_decl=${ac_cv_have_asprintf_decl=yes}
52ac_cv_have_setresgid_decl=${ac_cv_have_setresgid_decl=yes}
53ac_cv_have_setresuid_decl=${ac_cv_have_setresuid_decl=yes}
54ac_cv_have_vasprintf_decl=${ac_cv_have_vasprintf_decl=yes}
55fu_cv_sys_stat_statvfs64=${fu_cv_sys_stat_statvfs64=yes}
56samba_cv_FTRUNCATE_NEEDS_ROOT=${samba_cv_FTRUNCATE_NEEDS_ROOT=no}
57samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=no}
58samba_cv_HAVE_BROKEN_GETGROUPS=${samba_cv_HAVE_BROKEN_GETGROUPS=no}
59samba_cv_HAVE_BROKEN_READDIR=${samba_cv_HAVE_BROKEN_READDIR=no}
60samba_cv_HAVE_C99_VSNPRINTF=${samba_cv_HAVE_C99_VSNPRINTF=yes}
61samba_cv_HAVE_DEV64_T=${samba_cv_HAVE_DEV64_T=no}
62samba_cv_HAVE_DEVICE_MAJOR_FN=${samba_cv_HAVE_DEVICE_MAJOR_FN=yes}
63samba_cv_HAVE_DEVICE_MINOR_FN=${samba_cv_HAVE_DEVICE_MINOR_FN=yes}
64samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=${samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes}
65samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
66samba_cv_HAVE_FTRUNCATE_EXTEND=${samba_cv_HAVE_FTRUNCATE_EXTEND=yes}
67samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
68samba_cv_HAVE_INO64_T=${samba_cv_HAVE_INO64_T=no}
69samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes}
70samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes}
71samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=yes}
72samba_cv_HAVE_MAKEDEV=${samba_cv_HAVE_MAKEDEV=yes}
73samba_cv_HAVE_MMAP=${samba_cv_HAVE_MMAP=yes}
74samba_cv_HAVE_OFF64_T=${samba_cv_HAVE_OFF64_T=no}
75samba_cv_HAVE_QUOTACTL_4A=${samba_cv_HAVE_QUOTACTL_4A=yes}
76samba_cv_HAVE_ROOT=${samba_cv_HAVE_ROOT=no}
77samba_cv_HAVE_SECURE_MKSTEMP=${samba_cv_HAVE_SECURE_MKSTEMP=yes}
78samba_cv_HAVE_SENDFILE64=${samba_cv_HAVE_SENDFILE64=yes}
79samba_cv_HAVE_STRUCT_DIRENT64=${samba_cv_HAVE_STRUCT_DIRENT64=yes}
80samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes}
81samba_cv_HAVE_TRUNCATED_SALT=${samba_cv_HAVE_TRUNCATED_SALT=no}
82samba_cv_HAVE_UNSIGNED_CHAR=${samba_cv_HAVE_UNSIGNED_CHAR=no}
83samba_cv_HAVE_WORKING_AF_LOCAL=${samba_cv_HAVE_WORKING_AF_LOCAL=no}
84samba_cv_HAVE_Werror=${samba_cv_HAVE_Werror=yes}
85samba_cv_REALPATH_TAKES_NULL=${samba_cv_REALPATH_TAKES_NULL=no}
86samba_cv_REPLACE_INET_NTOA=${samba_cv_REPLACE_INET_NTOA=no}
87samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes}
88samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes}
89samba_cv_SYSCONF_SC_NGROUPS_MAX=${samba_cv_SYSCONF_SC_NGROUPS_MAX=yes}
90samba_cv_SYSCONF_SC_NPROC_ONLN=${samba_cv_SYSCONF_SC_NPROC_ONLN=no}
91samba_cv_SYSQUOTA_FOUND=${samba_cv_SYSQUOTA_FOUND=yes}
92samba_cv_SYSQUOTA_WORKS=${samba_cv_SYSQUOTA_WORKS=yes}
93samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
94samba_cv_have_longlong=${samba_cv_have_longlong=yes}
95samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
96samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
97samba_cv_sysquotas_file=${samba_cv_sysquotas_file=lib/sysquotas_4A.c}
98# This cached value needs a local patch to pick it up, upstream 3.0.14a
99# doesn't cache it.
100samba_cv_LINUX_LFS_SUPPORT=${samba_cv_LINUX_LFS_SUPPORT=yes}
diff --git a/meta/site/x86_64-linux-uclibc b/meta/site/x86_64-linux-uclibc
deleted file mode 100644
index 2d269f78f7..0000000000
--- a/meta/site/x86_64-linux-uclibc
+++ /dev/null
@@ -1,91 +0,0 @@
1# general
2ac_cv_va_val_copy=${ac_cv_va_val_copy=no}
3ac_cv_func_lstat_dereferences_slashed_symlink=${ac_cv_func_lstat_dereferences_slashed_symlink=yes}
4ac_cv_func_lstat_empty_string_bug=${ac_cv_func_lstat_empty_string_bug=no}
5ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
6ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
7ac_cv_func_stat_empty_string_bug=${ac_cv_func_stat_empty_string_bug=no}
8ac_cv_func_stat_ignores_trailing_slash=${ac_cv_func_stat_ignores_trailing_slash=no}
9ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
10ac_cv_linux_vers=${ac_cv_linux_vers=2}
11ac_cv_need_trio=${ac_cv_need_trio=no}
12ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
13ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
14ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
15ac_cv_sizeof_long=${ac_cv_sizeof_long=8}
16ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16}
17ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=8}
18ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
19ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
20ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
21ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=8}
22ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=8}
23ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no}
24db_cv_alignp_t=${db_cv_alignp_t='unsigned long long'}
25db_cv_align_t=${db_cv_align_t='unsigned long long'}
26db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
27db_cv_sprintf_count=${db_cv_sprintf_count=yes}
28glib_cv_hasinline=${glib_cv_hasinline=yes}
29glib_cv_has__inline=${glib_cv_has__inline=yes}
30glib_cv_has__inline__=${glib_cv_has__inline__=yes}
31glib_cv_long_long_format=${glib_cv_long_long_format=ll}
32glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=yes}
33glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
34glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=40}
35glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8}
36glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=8}
37glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=8}
38glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=8}
39glib_cv_stack_grows=${glib_cv_stack_grows=no}
40glib_cv_sys_pthread_cond_timedwait_posix=${glib_cv_sys_pthread_cond_timedwait_posix=yes}
41glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=yes}
42glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes}
43glib_cv_uscore=${glib_cv_uscore=no}
44glib_cv_va_val_copy=${glib_cv_va_val_copy=no}
45nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no}
46samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes}
47screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
48screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes}
49screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes}
50screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no}
51screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no}
52screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no}
53screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no}
54screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes}
55screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes}
56utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
57
58# gettext
59am_cv_func_working_getline=${am_cv_func_working_getline=yes}
60
61# glib-2.0
62glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
63ac_cv_alignof_guint32=4
64ac_cv_alignof_guint64=8
65ac_cv_alignof_unsigned_long=8
66
67# libidl
68libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
69
70# ORBit2
71ac_cv_alignof_CORBA_boolean=1
72ac_cv_alignof_CORBA_char=1
73ac_cv_alignof_CORBA_double=4
74ac_cv_alignof_CORBA_float=4
75ac_cv_alignof_CORBA_long=4
76ac_cv_alignof_CORBA_long_double=8
77ac_cv_alignof_CORBA_long_long=8
78ac_cv_alignof_CORBA_octet=1
79ac_cv_alignof_CORBA_pointer=8
80ac_cv_alignof_CORBA_short=2
81ac_cv_alignof_CORBA_struct=1
82ac_cv_alignof_CORBA_wchar=2
83
84# startup-notification
85lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
86
87# lftp
88lftp_cv_va_val_copy=${lftp_cv_va_val_copy=no}
89
90# slrn
91slrn_cv_va_val_copy=${slrn_cv_va_val_copy=no}