cross.bbclass + gcc-package-cross.inc: put the immediate expansion trick in cross...

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index 09357ac..3588e23 100644 (file)
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -2,6 +2,10 @@
 # no need for them to be a direct target of 'world'
 EXCLUDE_FROM_WORLD = "1"
 
+# Save PACKAGE_ARCH before changing HOST_ARCH
+OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
+PACKAGE_ARCH = ${OLD_PACKAGE_ARCH}
+
 PACKAGES = ""
 
 HOST_ARCH = "${BUILD_ARCH}"

diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc
index dd2703d..d9fe3be 100644 (file)
--- a/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@ -6,17 +6,9 @@ HAS_GFORTRAN ?= "no"
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds
-MY_ARCH := "${PACKAGE_ARCH}"
-
 PACKAGES = "libgcc libgcc-dev libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev"
 PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*"
 
-PACKAGE_ARCH_libg2c = "${MY_ARCH}"
-PACKAGE_ARCH_libg2c-dev = "${MY_ARCH}"
-PACKAGE_ARCH_libgfortran = "${MY_ARCH}"
-PACKAGE_ARCH_libgfortran-dev = "${MY_ARCH}"
-
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
 FILES_libg2c-dev = "${target_libdir}/libg2c.so \
@@ -28,13 +20,9 @@ FILES_libgfortran-dev = "${target_libdir}/libgfortran.a \
                         ${target_libdir}/libgfortran.so \
                         ${target_libdir}/libgfortranbegin.a"
 
-PACKAGE_ARCH_libgcc = "${MY_ARCH}"
-PACKAGE_ARCH_libgcc-dev = "${MY_ARCH}"
 FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
 FILES_libgcc-dev = "${target_base_libdir}/libgcc_s.so"
 
-PACKAGE_ARCH_libstdc++ = "${MY_ARCH}"
-PACKAGE_ARCH_libstdc++-dev = "${MY_ARCH}"
 FILES_libstdc++ = "${target_libdir}/libstdc++.so.*"
 FILES_libstdc++-dev = "${target_includedir}/c++/${PV} \
                       ${target_libdir}/libstdc++.so \