From 474234a362b4cda5f2f1afab369c98d4e0ca1b11 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 25 Aug 2014 12:01:17 -0700 Subject: [PATCH] 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_ = "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 Signed-off-by: Richard Purdie --- meta/classes/native.bbclass | 1 + meta/classes/nativesdk.bbclass | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 2d182f0ebc..95f62fc1ce 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -104,6 +104,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 7f94258bf1..fb8971d720 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 -- 2.40.1