Skip to contentSkip to conversation

Empty out MACHINE overrides for native and nativesdk

PATCH In review Khem Raj 2 participants 4 messages Aug 25, 2014 – Aug 28, 2014

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

cover Empty out MACHINE overrides for native and nativesdk

The following changes since commit 217aa4d9802609d2c3628c8751a27a5d25900898:

autogen-native: inherit pkgconfig to fix a build failure (2014-08-25 10:25:54 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib kraj/machineoverride
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/machineoverrides

Khem Raj (1):
native/nativesdk: Clear MACHINEOVERRIDES

 meta/classes/native.bbclass    |    1 +
 meta/classes/nativesdk.bbclass |    1 +
 2 files changed, 2 insertions(+)
Signature · 1 line
1.7.10.4
author
#1 lore raw

PATCH 1/1 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

---
 meta/classes/native.bbclass    |    1 +
 meta/classes/nativesdk.bbclass |    1 +
 2 files changed, 2 insertions(+)
meta/classes/native.bbclass +1 -0
index 9dec318..adebb97 100644
@@ -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:"
 
meta/classes/nativesdk.bbclass +1 -0
index 37c9f79..5e78116 100644
@@ -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
Signature · 1 line
1.7.10.4
Tested-by on v1 1/1
#2 lore raw

Re: [PATCH 1/1] native/nativesdk: Clear MACHINEOVERRIDES

Quoted 14 lines · Khem Raj

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

Quoted 1 line
Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#3 lore raw

Re: [PATCH 1/1] native/nativesdk: Clear MACHINEOVERRIDES

Hello Saul,

Quoted 15 lines · Otavio Salvador
Quoted 14 lines · Khem Raj

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

Quoted 3 lines
Quoted 1 line

Can this to be backported to Daisy?

This solve an issue which took a while to figure out in meta-fsl-arm; this may also affect others and it is hard to debug.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750