From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Aug 2011 22:20:20 +0000 (+0200)
Subject: gcc: fix libstdc++ symbol versioning (wrong linker detection).
X-Git-Tag: v2.9-core53~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b56ee99a882897d0ec0c27e0a871556a5b40038;p=people%2Fstevee%2Fipfire-2.x.git

gcc: fix libstdc++ symbol versioning (wrong linker detection).
---

diff --git a/lfs/gcc b/lfs/gcc
index 40d779dcff..af87e21164 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -110,6 +110,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_linker_version_detection.patch
 	@mkdir $(DIR_SRC)/gcc-build
 ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
diff --git a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
new file mode 100644
index 0000000000..c2f43be358
--- /dev/null
+++ b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
@@ -0,0 +1,12 @@
+diff -Naur gcc-4.1.2.org/libstdc++-v3/configure gcc-4.1.2/libstdc++-v3/configure
+--- gcc-4.1.2.org/libstdc++-v3/configure	2007-01-29 11:51:01.000000000 +0100
++++ gcc-4.1.2/libstdc++-v3/configure	2011-08-29 19:25:22.973430586 +0200
+@@ -8281,7 +8281,7 @@
+   if test x"$with_gnu_ld" = x"yes"; then
+ 
+     ldver=`$LD --version 2>/dev/null | head -1 | \
+-           sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
++           sed -e 's/GNU ld (GNU binutils) \([0-9.][0-9.]*\).*/\1/'`
+ 
+     glibcxx_gnu_ld_version=`echo $ldver | \
+            $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`