toolchain: Add patch for building gcc-4.5.0 with mprf >= 3.0.0.

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44455

diff --git a/config/naoki.conf b/config/naoki.conf
index 9cadfdf6f56b46e8911b42b3f41da456e058005f..d55e14bec859e4f3721e5d4c7f0965453193a7f0 100644 (file)
--- a/config/naoki.conf
+++ b/config/naoki.conf
@@ -24,7 +24,7 @@ slogan = "Gluttony"
 [toolchain]
 
 ; Counter of toolchain version
-version = 4
+version = 5
 
 
 [sources]

diff --git a/pkgs/toolchain/gcc-static/patches/gcc-4.5.0-gmp-mpfr-build-fix-1.patch b/pkgs/toolchain/gcc-static/patches/gcc-4.5.0-gmp-mpfr-build-fix-1.patch
new file mode 100644 (file)
index 0000000..f2e91dc
--- /dev/null
+++ b/pkgs/toolchain/gcc-static/patches/gcc-4.5.0-gmp-mpfr-build-fix-1.patch
@@ -0,0 +1,26 @@
+Index: gcc/configure
+===================================================================
+--- gcc/configure      (revision 162481)
++++ gcc/configure      (revision 162482)
+@@ -5478,7 +5478,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+Index: gcc/configure.ac
+===================================================================
+--- gcc/configure.ac   (revision 162481)
++++ gcc/configure.ac   (revision 162482)
+@@ -1354,7 +1354,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet

diff --git a/pkgs/toolchain/gcc/patches/gcc-4.5.0-gmp-mpfr-build-fix-1.patch b/pkgs/toolchain/gcc/patches/gcc-4.5.0-gmp-mpfr-build-fix-1.patch
new file mode 100644 (file)
index 0000000..f2e91dc
--- /dev/null
+++ b/pkgs/toolchain/gcc/patches/gcc-4.5.0-gmp-mpfr-build-fix-1.patch
@@ -0,0 +1,26 @@
+Index: gcc/configure
+===================================================================
+--- gcc/configure      (revision 162481)
++++ gcc/configure      (revision 162482)
+@@ -5478,7 +5478,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+Index: gcc/configure.ac
+===================================================================
+--- gcc/configure.ac   (revision 162481)
++++ gcc/configure.ac   (revision 162482)
+@@ -1354,7 +1354,7 @@
+ if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
+   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
+   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
+-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
++  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
+   # Do not test the gmp version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet