[oe-commits] org.oe.dev cross.bbclass + gcc-package-cross.inc: put the immediate expansion trick in cross.bbclass

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 9562dbacc0c8663cc9491b5869fd3ffa505a5e75
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9562dbacc0c8663cc9491b5869fd3ffa505a5e75
Files:
1
classes/cross.bbclass
packages/gcc/gcc-package-cross.inc
Diffs:

#
# mt diff -r45e7f7da69aaab53637fa9b1900cb11deb4d6e71 -r9562dbacc0c8663cc9491b5869fd3ffa505a5e75
#
# 
# 
# patch "classes/cross.bbclass"
#  from [ecb9692ca6c921060326ab72fd7071f928485d00]
#    to [c0fd2d21a749ceca1bef334641e20b66e044c5b4]
# 
# patch "packages/gcc/gcc-package-cross.inc"
#  from [dda998308babfe7138319c581c2969e2bb381fcf]
#    to [02cf25e589eef74ad349812027d82351a7cf8ec9]
# 
============================================================
--- classes/cross.bbclass	ecb9692ca6c921060326ab72fd7071f928485d00
+++ classes/cross.bbclass	c0fd2d21a749ceca1bef334641e20b66e044c5b4
@@ -1,7 +1,11 @@ EXCLUDE_FROM_WORLD = "1"
 # Cross packages are built indirectly via dependency,
 # 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}"
============================================================
--- packages/gcc/gcc-package-cross.inc	dda998308babfe7138319c581c2969e2bb381fcf
+++ packages/gcc/gcc-package-cross.inc	02cf25e589eef74ad349812027d82351a7cf8ec9
@@ -6,17 +6,9 @@ INHIBIT_PACKAGE_STRIP = "1"
 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
 			 ${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 \