Add patch for bug #492590.

2 files changed, 99 insertions, 1 deletions

diff --git a/4.8.2/gentoo/93_all_cross-build-cxxflags.patch b/4.8.2/gentoo/93_all_cross-build-cxxflags.patch
new file mode 100644
index 0000000..0e2c633
--- /dev/null
+++ b/4.8.2/gentoo/93_all_cross-build-cxxflags.patch
@@ -0,0 +1,97 @@
+sys-devel/gcc-4.8.2 fails to create a cross-compiler -- build/gcc/ seems to mix host compiler with target flags
+https://bugs.gentoo.org/492590
+https://bugs.gentoo.org/492972
+http://gcc.gnu.org/ml/gcc-patches/2013-12/msg00304.html
+
+
+commit b1009c8da943bcfe84455313dff13dfbd998bd57
+Author: amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date:   Mon Dec 9 11:30:39 2013 +0000
+
+    2013-12-09  Alan Modra  <amodra@gmail.com>
+    
+    	Apply from mainline
+    	2013-12-05  Alan Modra  <amodra@gmail.com>
+    	* configure.ac (BUILD_CXXFLAGS) Don't use ALL_CXXFLAGS for
+    	build != host.
+    	<recursive call for build != host>: Clear GMPINC.  Don't bother
+    	saving CFLAGS.
+    	* configure: Regenerate.
+    
+    
+    
+    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@205803 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog    | 10 ++++++++++
+ gcc/configure    |  9 ++++-----
+ gcc/configure.ac |  5 ++---
+ 3 files changed, 16 insertions(+), 8 deletions(-)
+
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -11202,13 +11202,11 @@ else
+ 	/* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
+ 	*) realsrcdir=../${srcdir};;
+ 	esac
+-	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+-	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" GMPINC="" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+-	CFLAGS="${saved_CFLAGS}"
+ 
+ 	# We just finished tests for the build machine, so rename
+ 	# the file auto-build.h in the gcc directory.
+@@ -11703,6 +11701,7 @@ STMP_FIXINC=stmp-fixinc
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
++    BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CXXFLAGS_FOR_BUILD)'
+     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+ fi
+ 
+@@ -17828,7 +17827,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 17831 "configure"
++#line 17830 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -17934,7 +17933,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 17937 "configure"
++#line 17936 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -1516,13 +1516,11 @@ else
+ 	/* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
+ 	*) realsrcdir=../${srcdir};;
+ 	esac
+-	saved_CFLAGS="${CFLAGS}"
+ 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+-	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
++	LDFLAGS="${LDFLAGS_FOR_BUILD}" GMPINC="" \
+ 	${realsrcdir}/configure \
+ 		--enable-languages=${enable_languages-all} \
+ 		--target=$target_alias --host=$build_alias --build=$build_alias
+-	CFLAGS="${saved_CFLAGS}"
+ 
+ 	# We just finished tests for the build machine, so rename
+ 	# the file auto-build.h in the gcc directory.
+@@ -1887,6 +1885,7 @@ STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
++    BUILD_CXXFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CXXFLAGS_FOR_BUILD)'
+     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+ fi
+ 
diff --git a/4.8.2/gentoo/README.history b/4.8.2/gentoo/README.history
index 807d3dd..492c18f 100644
--- a/4.8.2/gentoo/README.history
+++ b/4.8.2/gentoo/README.history
@@ -1,5 +1,6 @@
-1.2		[pending]
+1.2		29 Dec 2013
 	U 67_all_gcc-poison-system-directories.patch
+	+ 93_all_cross-build-cxxflags.patch
 
 1.1		23 Dec 2013
 	+ 20_all_gcj-freetype.patch