From 43a99745217b7d20c1bf532f5ac3a774c4460535 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 16 May 2008 09:28:06 +0000
Subject: gcc: Sync libssp changes from OE.dev

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4486 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gcc/gcc-4.3.0.inc           | 2 +-
 meta/packages/gcc/gcc-configure-cross.inc | 6 ++++--
 meta/packages/gcc/gcc-cross_4.3.0.bb      | 2 +-
 meta/packages/gcc/gcc-package-cross.inc   | 6 +++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/gcc/gcc-4.3.0.inc b/meta/packages/gcc/gcc-4.3.0.inc
index 02ceea736..96b7d0250 100644
--- a/meta/packages/gcc/gcc-4.3.0.inc
+++ b/meta/packages/gcc/gcc-4.3.0.inc
@@ -67,5 +67,5 @@ SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 FORTRAN = ""
 JAVA = ""
 
-EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
 
diff --git a/meta/packages/gcc/gcc-configure-cross.inc b/meta/packages/gcc/gcc-configure-cross.inc
index 13c76f976..68b8fd1cc 100644
--- a/meta/packages/gcc/gcc-configure-cross.inc
+++ b/meta/packages/gcc/gcc-configure-cross.inc
@@ -49,8 +49,10 @@ do_stage_append () {
 	done
 
 	#fix up libsupc++ and libstdc++ la files
-	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libsupc++.la || true
-	sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/lib ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/lib/libstdc++.la || true
+	for d in lib lib/nof; do
+		sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libsupc++.la || true
+		sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-L${CROSS_DIR}/${TARGET_SYS}/$d ${LIBGCCS_VAR} -lc -lm '|" ${CROSS_DIR}/${TARGET_SYS}/$d/libstdc++.la || true
+	done
 }
 
 do_package_write_ipk[depends] += "virtual/libc:do_package"
diff --git a/meta/packages/gcc/gcc-cross_4.3.0.bb b/meta/packages/gcc/gcc-cross_4.3.0.bb
index f51e60ce1..9821d3cd8 100644
--- a/meta/packages/gcc/gcc-cross_4.3.0.bb
+++ b/meta/packages/gcc/gcc-cross_4.3.0.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 require gcc-${PV}.inc
 require gcc-cross4.inc
diff --git a/meta/packages/gcc/gcc-package-cross.inc b/meta/packages/gcc/gcc-package-cross.inc
index 54294f4fa..b95ef88e6 100644
--- a/meta/packages/gcc/gcc-package-cross.inc
+++ b/meta/packages/gcc/gcc-package-cross.inc
@@ -2,11 +2,13 @@ INHIBIT_PACKAGE_STRIP ?= ""
 OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}"
 INHIBIT_PACKAGE_STRIP = "1"
 
-PACKAGES = "libgcc libstdc++ libg2c libgfortran"
+PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran"
 
 # Called from within gcc-cross, so libdir is set wrong
 FILES_libg2c = "${target_libdir}/libg2c.so.*"
 
+FILES_libssp = "${target_libdir}/libssp.so.*"
+
 FILES_libgfortran = "${target_libdir}/libgfortran.so.*"
 
 FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1"
@@ -40,11 +42,13 @@ do_install () {
            mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true 	
 
         else
            mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true
            mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true
+           mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true
         fi
 
 
-- 
cgit v1.2.3