changeset 6218:2aaa8977b766 master

Patch gcc 4.7.2 so that it builds
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sat, 09 Mar 2013 22:50:22 -0500
parents 0146243c7915
children
files gub/specs/cross/gcc.py patches/gcc-4.7.2-fix-libstdc++-debug-build.patch
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/cross/gcc.py	Fri Mar 08 10:03:48 2013 -0500
+++ b/gub/specs/cross/gcc.py	Sat Mar 09 22:50:22 2013 -0500
@@ -9,6 +9,7 @@
 
 class Gcc (cross.AutoBuild):
     source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.gz'
+    patches = ['gcc-4.7.2-fix-libstdc++-debug-build.patch']
     dependencies = ['cross/binutils']
     configure_flags = (cross.AutoBuild.configure_flags
                 + '%(enable_languages)s'
@@ -77,7 +78,6 @@
 Gcc__linux = Gcc__from__source
 
 class Gcc__mingw (Gcc):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.gz'
     dependencies = (Gcc.dependencies
                 + ['mingw-runtime', 'w32api']
                 + ['tools::libtool'])
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc-4.7.2-fix-libstdc++-debug-build.patch	Sat Mar 09 22:50:22 2013 -0500
@@ -0,0 +1,11 @@
+--- gcc-4.7.2/libstdc++-v3/src/Makefile.in-	2013-03-09 21:51:54.035184011 -0500
++++ gcc-4.7.2/libstdc++-v3/src/Makefile.in	2013-03-09 21:54:07.246587046 -0500
+@@ -914,7 +914,7 @@
+ 	  mv Makefile Makefile.tmp; \
+ 	  sed -e 's,all-local: all-once,all-local:,' \
+ 	      -e 's,install-data-local: install-data-once,install-data-local:,' \
+-	      -e '/vpath/!s,src/c,src/debug/c,' \
++	      -e 's,\$(top_builddir)/src/c++,\$(top_builddir)/src/debug/c++,' \
+ 	  < Makefile.tmp > Makefile ; \
+ 	  $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
+ 	  toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;