summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-08-25 12:01:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-27 12:12:04 +0100
commit6907da7eb44dca812dbb9e214357ee96e9ff738a (patch)
tree4bbae4ff9ffffdb0267a0d6c25412ef646154cb0
parent9d31e1e6ce07991fe360e67295311e62a55603af (diff)
downloadopenembedded-core-6907da7eb44dca812dbb9e214357ee96e9ff738a.tar.gz
openembedded-core-6907da7eb44dca812dbb9e214357ee96e9ff738a.tar.bz2
openembedded-core-6907da7eb44dca812dbb9e214357ee96e9ff738a.zip
native/nativesdk: Clear MACHINEOVERRIDES
In cases where we override variables e.g PACKAGE_ARCH conditionally and use a MACHINEOVERRIDE to qualify the override like PACKAGE_ARCH_<MACHINE> = "some target PACKAGE_ARCH" This would also be effective if this recipe is BBEXTENDED to native or nativesdk which is undesired This particular issue will cause wrong sysroot to be used for nativesdk case since PACKAGE_ARCH would have been modified and eventually changing value of STAGING_DIR_TARGET which we use as --sysroot option to cross and cross-canadian built SDK gcc Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/native.bbclass1
-rw-r--r--meta/classes/nativesdk.bbclass1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 9dec318aa8..adebb97651 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -109,6 +109,7 @@ PKG_CONFIG_SYSROOT_DIR = ""
# we dont want libc-uclibc or libc-glibc to kick in for native recipes
LIBCOVERRIDE = ""
CLASSOVERRIDE = "class-native"
+MACHINEOVERRIDES = ""
PATH_prepend = "${COREBASE}/scripts/native-intercept:"
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 37c9f79598..5e78116ab8 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -8,6 +8,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
NATIVESDKLIBC ?= "libc-glibc"
LIBCOVERRIDE = ":${NATIVESDKLIBC}"
CLASSOVERRIDE = "class-nativesdk"
+MACHINEOVERRIDES = ""
#
# Update PACKAGE_ARCH and PACKAGE_ARCHS