Skip to contentSkip to conversation

Separate add-on settings for target/nativesdk eglibc

PATCH Applied Lianhao Lu 2 participants 3 messages Apr 3, 2012

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Separate add-on settings for target/nativesdk eglibc

This patch uses a separate setting SDK_GLIBC_ADDONS for naitvesdk eglibc add-on settins.

The following changes since commit 5bcb68a232539cf11a30e3b812b2fbd6d7d76e35:
Richard Purdie (1):
gettext: Fix sysroot conflict over owner of macros

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/nativesdkfixing
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/nativesdkfixing

Lianhao Lu (1):
eglibc: SDK_GLIBC_ADDONS for eglibc-nativesdk.

 meta/conf/machine-sdk/i586.conf         |    2 ++
 meta/conf/machine-sdk/i686.conf         |    2 ++
 meta/conf/machine-sdk/x86_64.conf       |    4 +++-
 meta/recipes-core/eglibc/eglibc.inc     |    4 ++++
 meta/recipes-core/eglibc/eglibc_2.13.bb |    5 ++---
 meta/recipes-core/eglibc/eglibc_2.15.bb |    4 +---
 6 files changed, 14 insertions(+), 7 deletions(-)
author
#1 lore raw

PATCH 1/1 eglibc: SDK_GLIBC_ADDONS for eglibc-nativesdk.

Use SDK_GLIBC_ADDONS for eglibc-nativesdk so that it is not dependant on the target eglibc's GLIBC_ADDONS settings.

Signed-off-by Lianhao Lu <[email protected]>
---
 meta/conf/machine-sdk/i586.conf         |    2 ++
 meta/conf/machine-sdk/i686.conf         |    2 ++
 meta/conf/machine-sdk/x86_64.conf       |    4 +++-
 meta/recipes-core/eglibc/eglibc.inc     |    4 ++++
 meta/recipes-core/eglibc/eglibc_2.13.bb |    5 ++---
 meta/recipes-core/eglibc/eglibc_2.15.bb |    4 +---
 6 files changed, 14 insertions(+), 7 deletions(-)
meta/conf/machine-sdk/i586.conf +2 -0
index 0b748a5..190f2bd 100644
@@ -1,2 +1,4 @@
 SDK_ARCH = "i586"
 SDK_CC_ARCH = "-march=i586"
+
+SDK_GLIBC_ADDONS = "nptl"
meta/conf/machine-sdk/i686.conf +2 -0
index ffdb461..3e8e4f4 100644
@@ -1,2 +1,4 @@
 SDK_ARCH = "i686"
 SDK_CC_ARCH = "-march=i686"
+
+SDK_GLIBC_ADDONS = "nptl"
meta/conf/machine-sdk/x86_64.conf +3 -1
index a6adb28..9495842 100644
@@ -1 +1,3 @@
-SDK_ARCH = "x86_64"
\ No newline at end of file
+SDK_ARCH = "x86_64"
+
+SDK_GLIBC_ADDONS = "nptl"
meta/recipes-core/eglibc/eglibc.inc +4 -0
index da5c187..8e3fe50 100644
@@ -50,3 +50,7 @@ do_configure_prepend() {
 	sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
 	echo '${OE_FEATURES}' > ${B}/option-groups.config
 }
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+SDK_GLIBC_ADDONS ?= "ports,nptl,libidn"
+GLIBC_ADDONS_virtclass-nativesdk = "${SDK_GLIBC_ADDONS}"
meta/recipes-core/eglibc/eglibc_2.13.bb +2 -3
index e02c80f..927f72f 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "15508"
 
 DEPENDS += "gperf-native"
-PR = "r22"
+PR = "r23"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_13"

@@ -36,8 +36,6 @@ PROVIDES_${PN}-dbg = "glibc-dbg"
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
-GLIBC_ADDONS ?= "ports,nptl,libidn"
-
 GLIBC_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"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"

@@ -60,6 +58,7 @@ python __anonymous () {
 
 export libc_cv_slibdir = "${base_libdir}"
 
+
 EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
                 --without-cvs --disable-profile --disable-debug --without-gd \
                 --enable-clocale=gnu \
meta/recipes-core/eglibc/eglibc_2.15.bb +1 -3
index 75ccace..1575e7f 100644
@@ -3,7 +3,7 @@ require eglibc.inc
 SRCREV = "17386"
 
 DEPENDS += "gperf-native"
-PR = "r2"
+PR = "r3"
 PR_append = "+svnr${SRCPV}"
 
 EGLIBC_BRANCH="eglibc-2_15"

@@ -41,8 +41,6 @@ PROVIDES_${PN}-dbg = "glibc-dbg"
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
 
-GLIBC_ADDONS ?= "ports,nptl,libidn"
-
 GLIBC_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"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
Signature · 1 line
1.7.0.4
Applied
#2 lore raw

Re: [PATCH 1/1] eglibc: SDK_GLIBC_ADDONS for eglibc-nativesdk.

Quoted 4 lines · Lianhao Lu

Use SDK_GLIBC_ADDONS for eglibc-nativesdk so that it is not dependant on the target eglibc's GLIBC_ADDONS settings.

Signed-off-by Lianhao Lu <[email protected]>
Quoted 8 lines
---
 meta/conf/machine-sdk/i586.conf         |    2 ++
 meta/conf/machine-sdk/i686.conf         |    2 ++
 meta/conf/machine-sdk/x86_64.conf       |    4 +++-
 meta/recipes-core/eglibc/eglibc.inc     |    4 ++++
 meta/recipes-core/eglibc/eglibc_2.13.bb |    5 ++---
 meta/recipes-core/eglibc/eglibc_2.15.bb |    4 +---
 6 files changed, 14 insertions(+), 7 deletions(-)

Merged to master, thanks.

Richard