Make gcc-inplace-math work with new mpfr.

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

2 files changed, 18 insertions, 6 deletions

diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index bd7482b7a39..ff24a2f6a4e 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2012/04/13 11:01:32 hans Exp $
+$NetBSD: distinfo,v 1.14 2012/05/03 12:20:18 hans Exp $
 
 SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75
 RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a
 Size (gcc-4.4.7.tar.bz2) = 63179340 bytes
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = b36357efde53ee3e1a7b18f30b7ae9d9ab837325
+SHA1 (patch-ad) = 96722d5af63a955e3d9c934b1249e5e8a1173a8c
 SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621
 SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b
 SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7
diff --git a/lang/gcc44/patches/patch-ad b/lang/gcc44/patches/patch-ad
index 0e3425143c6..035784d36ef 100644
--- a/lang/gcc44/patches/patch-ad
+++ b/lang/gcc44/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
+$NetBSD: patch-ad,v 1.4 2012/05/03 12:20:19 hans Exp $
 
 --- configure.orig	2010-10-02 11:40:32.000000000 +0000
 +++ configure
-@@ -4532,7 +4532,7 @@ if test "${with_mpfr_lib+set}" = set; th
+@@ -4534,7 +4534,7 @@ if test "${with_mpfr_lib+set}" = set; th
  fi;
  
  if test "x$with_mpfr" != x; then
@@ -11,7 +11,20 @@ $NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
    gmpinc="-I$with_mpfr/include"
  fi
  if test "x$with_mpfr_include" != x; then
-@@ -4596,7 +4596,7 @@
+@@ -4544,8 +4544,10 @@ if test "x$with_mpfr_lib" != x; then
+   gmplibs="-L$with_mpfr_lib $gmplibs"
+ fi
+ if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
+-  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs"
+-  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
++  sdir=
++  test -d "${srcdir}/mpfr/src" && sdir=/src
++  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"${sdir}"'/.libs -L$$r/$(HOST_SUBDIR)/mpfr'"${sdir}/_libs $gmplibs"
++  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"${sdir} "'-I$$s/mpfr'"${sdir} $gmpinc"
+   # Do not test the mpfr version.  Assume that it is sufficient, since
+   # it is in the source tree, and the library has not been built yet
+   # but it would be included on the link line in the version check below
+@@ -4598,7 +4600,7 @@ fi
  if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
    gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs"
    gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
@@ -20,4 +33,3 @@ $NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $
    # 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
    # but it would be included on the link line in the version check below
-