summaryrefslogtreecommitdiff
path: root/lang/gcc45
diff options
context:
space:
mode:
authorhans <hans>2012-05-03 12:20:18 +0000
committerhans <hans>2012-05-03 12:20:18 +0000
commit5fd1c44d6e6477a5ae8da1ee1747045ad436bee6 (patch)
tree21847bb986f924b3883ba8ca659483459d7dd62f /lang/gcc45
parenteaf45ddfd649163095abfcb3a47afe3f291a5038 (diff)
downloadpkgsrc-5fd1c44d6e6477a5ae8da1ee1747045ad436bee6.tar.gz
Make gcc-inplace-math work with new mpfr.
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51935
Diffstat (limited to 'lang/gcc45')
-rw-r--r--lang/gcc45/distinfo4
-rw-r--r--lang/gcc45/patches/patch-ad17
2 files changed, 18 insertions, 3 deletions
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 2905da0545c..6ce0378a486 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/12/22 14:14:22 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $
SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b
RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247
@@ -6,7 +6,7 @@ Size (gcc-4.5.3.tar.bz2) = 66374586 bytes
SHA1 (patch-aa) = c488dc25e038d97c737c8c72437660598d9e15d3
SHA1 (patch-ab) = 61bc2ebf150c6e471917e145d74e7795dc162194
SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = e26ba1275f5dc294b4412c55ddb540712e705cb5
+SHA1 (patch-ad) = b72c93d8477a567363616717e20eef1b33e7d307
SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989
SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b
SHA1 (patch-ah) = a963394b0434b82494b7510d4b2705f77acfb668
diff --git a/lang/gcc45/patches/patch-ad b/lang/gcc45/patches/patch-ad
index b63d6fdcfb6..a35c0bd5222 100644
--- a/lang/gcc45/patches/patch-ad
+++ b/lang/gcc45/patches/patch-ad
@@ -1,4 +1,4 @@
-$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 2010-04-02 13:35:47.000000000 -0400
+++ configure
@@ -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