[oe-commits] Tom Rini : canadian sdk: One last arch fixup in canadian-cross, fixup . la files from gcc

[GIT User account]

Module: openembedded.git
Branch: trini/canadian-sdk
Commit: 55b0905adfd56553670424a10dfab6f0d33bb1b5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=55b0905adfd56553670424a10dfab6f0d33bb1b5

Author: Tom Rini <trini at embeddedalley.com>
Date:   Wed Dec 24 13:22:59 2008 -0500

canadian sdk: One last arch fixup in canadian-cross, fixup .la files from gcc

---

 classes/canadian-cross.bbclass   |    4 ++++
 packages/gcc/mingw-gcc-build.inc |    8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/canadian-cross.bbclass b/classes/canadian-cross.bbclass
index 935729a..474fb1d 100644
--- a/classes/canadian-cross.bbclass
+++ b/classes/canadian-cross.bbclass
@@ -6,6 +6,10 @@ inherit canadian
 
 PACKAGES = ""
 
+BASE_PACKAGE_ARCH = "${SDK_ARCH}"
+BASEPKG_HOST_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}"
+BASEPKG_TARGET_SYS = "${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}"
+
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
diff --git a/packages/gcc/mingw-gcc-build.inc b/packages/gcc/mingw-gcc-build.inc
index e95efc5..4d7440f 100644
--- a/packages/gcc/mingw-gcc-build.inc
+++ b/packages/gcc/mingw-gcc-build.inc
@@ -35,7 +35,9 @@ do_configure () {
 }
 
 do_stage_append () {
-	#fix up libsupc++ and libstdc++ la files
-	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libsupc++.la || true
-	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libstdc++.la || true
+	# Fixup various .la files
+	sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libsupc++.la || true
+	sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libstdc++.la || true
+	sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libg2c.la || true
+	sed -i -e "s|installed=yes|installed=no|" -e "s|dependency_libs\s*=\s*.*|dependency_libs='-L${STAGING_DIR_HOST}${layout_libdir} ${LIBGCCS_VAR} -lc -lm '|" ${STAGING_DIR_HOST}${layout_libdir}/libobjc.la || true
 }