diff options
| author | hans <hans@pkgsrc.org> | 2012-05-03 12:20:18 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-05-03 12:20:18 +0000 |
| commit | 5f4bc9b6dc8793941a36e4bb3f632a52f19e528b (patch) | |
| tree | 21847bb986f924b3883ba8ca659483459d7dd62f /lang/gcc46 | |
| parent | 44388931a00b6d5a3797b709000bcc02d2978866 (diff) | |
| download | pkgsrc-5f4bc9b6dc8793941a36e4bb3f632a52f19e528b.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')
| -rw-r--r-- | lang/gcc46/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc46/patches/patch-ad | 19 |
2 files changed, 19 insertions, 4 deletions
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index d89769ae8ce..566d6c9efc3 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2012/04/17 08:24:54 wiz Exp $ +$NetBSD: distinfo,v 1.10 2012/05/03 12:20:19 hans Exp $ SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 @@ -6,7 +6,7 @@ Size (gcc-4.6.3.tar.bz2) = 71999439 bytes SHA1 (patch-aa) = e68232cd14d6be31dd2c45aefb454dde75d0bbba SHA1 (patch-ab) = 419dbd3e80b960ac391dba123d8de68abdd35355 SHA1 (patch-ac) = 0f708412670eca90c2c8e3fa675cffb14be768cd -SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1 +SHA1 (patch-ad) = b5e17219e7b7ba158b9f3e1a67e155fb158b4484 SHA1 (patch-af) = e4e194ef29924eb986536972c5f5e9f37d98eba3 SHA1 (patch-ag) = 1753d08075de8527d8f14afc3df4afeacb10d507 SHA1 (patch-ah) = 8df9292331e68a69481aaabc894f285199a7eb05 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 |