Patchwork classes, conf: Exclude native and nativesdk recipes from libc specific override

login
register
mail settings
Submitter Khem Raj
Date Dec. 1, 2011, 3:07 a.m.
Message ID <1322708827-27449-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/15929/
State Accepted
Commit 6e2b53f47da0e97271fb51b281d24da1e1d549cc
Headers show

Comments

Khem Raj - Dec. 1, 2011, 3:07 a.m.
Based on suggestions from RP

libc-uclibc and libc-glibc overrides are for denoting
system C library in use on the target and not for the
host therefore we make sure that the override only takes
effect for target recipes only.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/native.bbclass                |    3 +++
 meta/classes/nativesdk.bbclass             |    3 +++
 meta/conf/distro/include/tclibc-eglibc.inc |    3 ++-
 meta/conf/distro/include/tclibc-uclibc.inc |    3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)
Richard Purdie - Dec. 1, 2011, 12:53 p.m.
On Wed, 2011-11-30 at 19:07 -0800, Khem Raj wrote:
> Based on suggestions from RP
> 
> libc-uclibc and libc-glibc overrides are for denoting
> system C library in use on the target and not for the
> host therefore we make sure that the override only takes
> effect for target recipes only.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/classes/native.bbclass                |    3 +++
>  meta/classes/nativesdk.bbclass             |    3 +++
>  meta/conf/distro/include/tclibc-eglibc.inc |    3 ++-
>  meta/conf/distro/include/tclibc-uclibc.inc |    3 ++-
>  4 files changed, 10 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 8f7cc1f..49823d6 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -92,6 +92,9 @@  EXTRA_NATIVE_PKGCONFIG_PATH ?= ""
 PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
 PKG_CONFIG_SYSROOT_DIR = ""
 
+# we dont want libc-uclibc or libc-glibc to kick in for native recipes
+LIBCOVERRIDE = ""
+
 PATH =. "${COREBASE}/scripts/native-intercept:"
 
 python native_virtclass_handler () {
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index e6204c0..b8abc9f 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -6,6 +6,9 @@  EXCLUDE_FROM_WORLD = "1"
 
 STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}"
 
+# we dont want libc-uclibc or libc-glibc to kick in for nativesdk recipes
+LIBCOVERRIDE = ""
+
 #
 # Update PACKAGE_ARCH and PACKAGE_ARCHS
 #
diff --git a/meta/conf/distro/include/tclibc-eglibc.inc b/meta/conf/distro/include/tclibc-eglibc.inc
index 8ef3ceb..8b8a214 100644
--- a/meta/conf/distro/include/tclibc-eglibc.inc
+++ b/meta/conf/distro/include/tclibc-eglibc.inc
@@ -5,7 +5,8 @@ 
 LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
 
 # Add glibc overrides to the overrides for eglibc.
-OVERRIDES .= ":libc-glibc"
+LIBCOVERRIDE = ":libc-glibc"
+OVERRIDES .= "${LIBCOVERRIDE}"
 
 PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
 PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk"
diff --git a/meta/conf/distro/include/tclibc-uclibc.inc b/meta/conf/distro/include/tclibc-uclibc.inc
index e0f50a0..3984235 100644
--- a/meta/conf/distro/include/tclibc-uclibc.inc
+++ b/meta/conf/distro/include/tclibc-uclibc.inc
@@ -5,7 +5,8 @@ 
 LIBCEXTENSION = "-uclibc"
 
 # Add uclibc overrides to the overrides.
-OVERRIDES =. "libc-uclibc:"
+LIBCOVERRIDE = ":libc-uclibc"
+OVERRIDES .= "${LIBCOVERRIDE}"
 
 PREFERRED_PROVIDER_virtual/libc = "uclibc"
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"