summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-12-01 03:07:07 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 16:54:07 (GMT)
commitbf45449f1aeb98498c0194dbf60ed98af3feca75 (patch)
tree8a41d0660244bcbc123b3907456f3f3020b18413
parentf9e56d0ba42ebaee70fec01e48dda1cb040d9090 (diff)
downloadpoky-bf45449f1aeb98498c0194dbf60ed98af3feca75.tar.gz
classes, conf: Exclude native and nativesdk recipes from libc specific override
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. (From OE-Core rev: 6e2b53f47da0e97271fb51b281d24da1e1d549cc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/native.bbclass3
-rw-r--r--meta/classes/nativesdk.bbclass3
-rw-r--r--meta/conf/distro/include/tclibc-eglibc.inc3
-rw-r--r--meta/conf/distro/include/tclibc-uclibc.inc3
4 files changed, 10 insertions, 2 deletions
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 ?= ""
92PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}" 92PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
93PKG_CONFIG_SYSROOT_DIR = "" 93PKG_CONFIG_SYSROOT_DIR = ""
94 94
95# we dont want libc-uclibc or libc-glibc to kick in for native recipes
96LIBCOVERRIDE = ""
97
95PATH =. "${COREBASE}/scripts/native-intercept:" 98PATH =. "${COREBASE}/scripts/native-intercept:"
96 99
97python native_virtclass_handler () { 100python 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"
6 6
7STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}" 7STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}"
8 8
9# we dont want libc-uclibc or libc-glibc to kick in for nativesdk recipes
10LIBCOVERRIDE = ""
11
9# 12#
10# Update PACKAGE_ARCH and PACKAGE_ARCHS 13# Update PACKAGE_ARCH and PACKAGE_ARCHS
11# 14#
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 @@
5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}" 5LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
6 6
7# Add glibc overrides to the overrides for eglibc. 7# Add glibc overrides to the overrides for eglibc.
8OVERRIDES .= ":libc-glibc" 8LIBCOVERRIDE = ":libc-glibc"
9OVERRIDES .= "${LIBCOVERRIDE}"
9 10
10PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" 11PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
11PREFERRED_PROVIDER_virtual/libiconv-nativesdk ?= "eglibc-nativesdk" 12PREFERRED_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 @@
5LIBCEXTENSION = "-uclibc" 5LIBCEXTENSION = "-uclibc"
6 6
7# Add uclibc overrides to the overrides. 7# Add uclibc overrides to the overrides.
8OVERRIDES =. "libc-uclibc:" 8LIBCOVERRIDE = ":libc-uclibc"
9OVERRIDES .= "${LIBCOVERRIDE}"
9 10
10PREFERRED_PROVIDER_virtual/libc = "uclibc" 11PREFERRED_PROVIDER_virtual/libc = "uclibc"
11PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" 12PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"