summaryrefslogtreecommitdiff
path: root/lang/gcc46/patches
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2012-05-03 12:20:18 +0000
committerhans <hans@pkgsrc.org>2012-05-03 12:20:18 +0000
commitd10913b05cedeb17604ba1eed217daa9875e98c0 (patch)
tree21847bb986f924b3883ba8ca659483459d7dd62f /lang/gcc46/patches
parent334e6a1b73e21ff5736cbe967d18ffd26fe15110 (diff)
downloadpkgsrc-d10913b05cedeb17604ba1eed217daa9875e98c0.tar.gz
Make gcc-inplace-math work with new mpfr.
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51935
Diffstat (limited to 'lang/gcc46/patches')
-rw-r--r--lang/gcc46/patches/patch-ad19
1 files changed, 17 insertions, 2 deletions
diff --git a/lang/gcc46/patches/patch-ad b/lang/gcc46/patches/patch-ad
index c02f6df0c06..66b788c7152 100644
--- a/lang/gcc46/patches/patch-ad
+++ b/lang/gcc46/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2012/05/03 12:20:19 hans Exp $
--- configure.orig 2011-03-16 18:27:36.000000000 +0000
+++ configure
-@@ -5275,7 +5275,7 @@ fi
+@@ -5269,7 +5269,7 @@ fi
if test "x$with_mpfr" != x; then
@@ -11,3 +11,18 @@ $NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
gmpinc="-I$with_mpfr/include $gmpinc"
fi
if test "x$with_mpfr_include" != x; then
+@@ -5279,9 +5279,11 @@ 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/'"$lt_cv_objdir $gmplibs"
+- gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
+- extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
++ sdir=
++ test -d "${srcdir}/mpfr/src" && sdir=/src
++ gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs"
++ gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc"
++ extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir"
+ # 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