summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine-sdk/i586.conf2
-rw-r--r--meta/conf/machine-sdk/i686.conf2
-rw-r--r--meta/conf/machine-sdk/x86_64.conf4
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc4
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.13.bb5
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb4
6 files changed, 14 insertions, 7 deletions
diff --git a/meta/conf/machine-sdk/i586.conf b/meta/conf/machine-sdk/i586.conf
index 0b748a5..190f2bd 100644
--- a/meta/conf/machine-sdk/i586.conf
+++ b/meta/conf/machine-sdk/i586.conf
@@ -1,2 +1,4 @@
1SDK_ARCH = "i586" 1SDK_ARCH = "i586"
2SDK_CC_ARCH = "-march=i586" 2SDK_CC_ARCH = "-march=i586"
3
4SDK_GLIBC_ADDONS = "nptl"
diff --git a/meta/conf/machine-sdk/i686.conf b/meta/conf/machine-sdk/i686.conf
index ffdb461..3e8e4f4 100644
--- a/meta/conf/machine-sdk/i686.conf
+++ b/meta/conf/machine-sdk/i686.conf
@@ -1,2 +1,4 @@
1SDK_ARCH = "i686" 1SDK_ARCH = "i686"
2SDK_CC_ARCH = "-march=i686" 2SDK_CC_ARCH = "-march=i686"
3
4SDK_GLIBC_ADDONS = "nptl"
diff --git a/meta/conf/machine-sdk/x86_64.conf b/meta/conf/machine-sdk/x86_64.conf
index a6adb28..9495842 100644
--- a/meta/conf/machine-sdk/x86_64.conf
+++ b/meta/conf/machine-sdk/x86_64.conf
@@ -1 +1,3 @@
1SDK_ARCH = "x86_64" \ No newline at end of file 1SDK_ARCH = "x86_64"
2
3SDK_GLIBC_ADDONS = "nptl"
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index da5c187..8e3fe50 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -50,3 +50,7 @@ do_configure_prepend() {
50 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in 50 sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
51 echo '${OE_FEATURES}' > ${B}/option-groups.config 51 echo '${OE_FEATURES}' > ${B}/option-groups.config
52} 52}
53
54GLIBC_ADDONS ?= "ports,nptl,libidn"
55SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
56GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index e02c80f..927f72f 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "15508" 3SRCREV = "15508"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r22" 6PR = "r23"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_13" 9EGLIBC_BRANCH="eglibc-2_13"
@@ -36,8 +36,6 @@ PROVIDES_${PN}-dbg = "glibc-dbg"
36BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 36BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
37TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 37TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
38 38
39GLIBC_ADDONS ?= "ports,nptl,libidn"
40
41GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" 39GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
42 40
43FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" 41FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
@@ -60,6 +58,7 @@ python __anonymous () {
60 58
61export libc_cv_slibdir = "${base_libdir}" 59export libc_cv_slibdir = "${base_libdir}"
62 60
61
63EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ 62EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
64 --without-cvs --disable-profile --disable-debug --without-gd \ 63 --without-cvs --disable-profile --disable-debug --without-gd \
65 --enable-clocale=gnu \ 64 --enable-clocale=gnu \
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 75ccace..1575e7f 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -3,7 +3,7 @@ require eglibc.inc
3SRCREV = "17386" 3SRCREV = "17386"
4 4
5DEPENDS += "gperf-native" 5DEPENDS += "gperf-native"
6PR = "r2" 6PR = "r3"
7PR_append = "+svnr${SRCPV}" 7PR_append = "+svnr${SRCPV}"
8 8
9EGLIBC_BRANCH="eglibc-2_15" 9EGLIBC_BRANCH="eglibc-2_15"
@@ -41,8 +41,6 @@ PROVIDES_${PN}-dbg = "glibc-dbg"
41BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 41BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
42TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" 42TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
43 43
44GLIBC_ADDONS ?= "ports,nptl,libidn"
45
46GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" 44GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
47 45
48FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" 46FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"