aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2008-12-06 18:12:33 -0600
committerMike Westerhof <mwester@dls.net>2008-12-06 18:12:33 -0600
commit332c3ff017430b453bf6ff645d3568216a90bad0 (patch)
tree213f23bd5aab201214b045cc6c880d9756665219
parent3b708b8e59b2146f01393ac9cf7505b15c723e53 (diff)
downloadopenembedded-332c3ff017430b453bf6ff645d3568216a90bad0.tar.gz
meta-toolchain: Preserve value of PACKAGE_ARCHS
This fixes build failures caused when building a "be" sdk/toolchain on a "le" machine, and vice-versa.
-rw-r--r--packages/meta/meta-toolchain.bb14
1 files changed, 14 insertions, 0 deletions
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 1fa4cdb63e..2a59ba2208 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -2,8 +2,22 @@ DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "opkg-native ipkg-utils-native fakeroot-native sed-native"
+# NOTE: We need to save and restore PACKAGE_ARCHS, because sdk.bbclass
+# will change HOST_ARCH, which can result in SITEINFO_ENDIANESS (which
+# is computed in siteinfo.bbclass) in changing if the original HOST_ARCH
+# endianess differs from the new HOST_ARCH endianess. SITEINFO_ENDIANNESS
+# is used in a number of places, including the construction of the
+# PACKAGE_EXTRA_ARCHS list for machines that are capable of running in
+# either endianess. There may be better ways to fix this.
+
+# Save value of PACKAGE_ARCHS (note the ":=" syntax to force immediate eval)
+REAL_PACKAGE_ARCHS := "${PACKAGE_ARCHS}"
+
inherit sdk meta
+# Restore PACKAGE_ARCHS (sdk.bbclass may have caused it to change)
+PACKAGE_ARCHS := "${REAL_PACKAGE_ARCHS}"
+
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_OUTPUT2 = "${SDK_DIR}/image-extras"