[oe-commits] Frans Meulenbroeks : gcc 4.1.2: fix dependency_libs for libstdc++ and libsupc++

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: bc56218e9e7982ba5289afbc57c937252898d052
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=bc56218e9e7982ba5289afbc57c937252898d052

Author: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Date:   Wed Feb 23 21:10:35 2011 +0100

gcc 4.1.2: fix dependency_libs for libstdc++ and libsupc++

This fixes a QA issue in gcc 4.1.2.
The patch is identical to what is done in gcc 4.2.2 and 4.2.4
The issues caused neek compilations to fail

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Tom Rini <tom_rini at mentor.com> (on irc)

---

 recipes/gcc/gcc-4.1.2.inc |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/recipes/gcc/gcc-4.1.2.inc b/recipes/gcc/gcc-4.1.2.inc
index 36b45db..9df67e2 100644
--- a/recipes/gcc/gcc-4.1.2.inc
+++ b/recipes/gcc/gcc-4.1.2.inc
@@ -5,7 +5,7 @@ NATIVEDEPS = "mpfr-native gmp-native"
 
 COMPATIBLE_TARGET_SYS = "."
 
-INC_PR = "r27"
+INC_PR = "r28"
 
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2;name=archive \
 	file://100-uclibc-conf.patch \
@@ -60,6 +60,19 @@ do_compile_prepend_avr32() {
        ln -sf ${S}/libstdc++-v3/config/os/uclibc/ ${S}/libstdc++-v3/config/os/uclibc-linux
 }
 
+# with sysroot this change is not needed for gcc 4.3+ but its needed
+# for older compilers because of bug in libtool as well as this PR
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=5291
+# we append the .la munging specially for libstdc++ and libsupc++ here
+# This change if needed for other compilers in use should be put
+# in there specific inc file.
+
+do_install_append () {
+        for d in ${target_libdir} ${target_libdir}/nof; do
+                sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-lm '|" ${D}$d/libsupc++.la || true
+                sed -i "s|dependency_libs\s*=\s*.*|dependency_libs='-lm '|" ${D}$d/libstdc++.la || true
+        done
+}
 
 # Language Overrides
 FORTRAN = ""