summaryrefslogtreecommitdiffstats
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:29 +0100
commitd09e6d883042e5d094cd08d829327c4bbbfae135 (patch)
tree38bd90e164bbaa11ed94b091e43c05841bdd7a1b
parent8491ca52b86f22c0d9ba8e4c927262dab322969c (diff)
downloadpoky-d09e6d883042e5d094cd08d829327c4bbbfae135.tar.gz
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 (From OE-Core rev: 6907da7eb44dca812dbb9e214357ee96e9ff738a) 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 = ""
109# we dont want libc-uclibc or libc-glibc to kick in for native recipes 109# we dont want libc-uclibc or libc-glibc to kick in for native recipes
110LIBCOVERRIDE = "" 110LIBCOVERRIDE = ""
111CLASSOVERRIDE = "class-native" 111CLASSOVERRIDE = "class-native"
112MACHINEOVERRIDES = ""
112 113
113PATH_prepend = "${COREBASE}/scripts/native-intercept:" 114PATH_prepend = "${COREBASE}/scripts/native-intercept:"
114 115
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
8NATIVESDKLIBC ?= "libc-glibc" 8NATIVESDKLIBC ?= "libc-glibc"
9LIBCOVERRIDE = ":${NATIVESDKLIBC}" 9LIBCOVERRIDE = ":${NATIVESDKLIBC}"
10CLASSOVERRIDE = "class-nativesdk" 10CLASSOVERRIDE = "class-nativesdk"
11MACHINEOVERRIDES = ""
11 12
12# 13#
13# Update PACKAGE_ARCH and PACKAGE_ARCHS 14# Update PACKAGE_ARCH and PACKAGE_ARCHS