Make gcc-inplace-math work with new mpfr. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51935diff -r1.13 -r1.14 pkgsrc/lang/gcc44/distinfo
(hans)
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.13 2012/04/13 11:01:32 hans Exp $ | 1 | $NetBSD: distinfo,v 1.14 2012/05/03 12:20:18 hans Exp $ | |
2 | 2 | |||
3 | SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75 | 3 | SHA1 (gcc-4.4.7.tar.bz2) = a6c834b0c2f58583da1d093de7a81a20ede9af75 | |
4 | RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a | 4 | RMD160 (gcc-4.4.7.tar.bz2) = 481609ebff38bf8a1fdf9a300dc460c1f425836a | |
5 | Size (gcc-4.4.7.tar.bz2) = 63179340 bytes | 5 | Size (gcc-4.4.7.tar.bz2) = 63179340 bytes | |
6 | SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee | 6 | SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee | |
7 | SHA1 (patch-ad) = b36357efde53ee3e1a7b18f30b7ae9d9ab837325 | 7 | SHA1 (patch-ad) = 96722d5af63a955e3d9c934b1249e5e8a1173a8c | |
8 | SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621 | 8 | SHA1 (patch-af) = 12f58f01e973f5684e8443ab402a70291bb6d621 | |
9 | SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b | 9 | SHA1 (patch-ag) = 0897b7ed75b4dc7d6ad50ecfa886edca7e29703b | |
10 | SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7 | 10 | SHA1 (patch-ai) = 96ffd5c07761a53dbb036930c49e4c84574455c7 | |
11 | SHA1 (patch-aj) = cde99b36f7f7dcf220ef4451108ad1ff7410a6a6 | 11 | SHA1 (patch-aj) = cde99b36f7f7dcf220ef4451108ad1ff7410a6a6 | |
12 | SHA1 (patch-ak) = 08da661b8b19fdd9fa086f67b185266c1d378658 | 12 | SHA1 (patch-ak) = 08da661b8b19fdd9fa086f67b185266c1d378658 | |
13 | SHA1 (patch-al) = 462059744f7f057f13d6c472d0aff9d012546082 | 13 | SHA1 (patch-al) = 462059744f7f057f13d6c472d0aff9d012546082 | |
14 | SHA1 (patch-am) = fcfabcec9e6d0b8e9ada348dc65e8ddb890f96ca | 14 | SHA1 (patch-am) = fcfabcec9e6d0b8e9ada348dc65e8ddb890f96ca | |
15 | SHA1 (patch-gcc_ginclude_stddef.h) = 867e3ff87f0b8865b37823c42c9b01935b94e5fb | 15 | SHA1 (patch-gcc_ginclude_stddef.h) = 867e3ff87f0b8865b37823c42c9b01935b94e5fb |
@@ -1,23 +1,35 @@ | @@ -1,23 +1,35 @@ | |||
1 | $NetBSD: patch-ad,v 1.3 2012/04/13 11:01:32 hans Exp $ | 1 | $NetBSD: patch-ad,v 1.4 2012/05/03 12:20:19 hans Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-10-02 11:40:32.000000000 +0000 | 3 | --- configure.orig 2010-10-02 11:40:32.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -4532,7 +4532,7 @@ if test "${with_mpfr_lib+set}" = set; th | 5 | @@ -4534,7 +4534,7 @@ if test "${with_mpfr_lib+set}" = set; th | |
6 | fi; | 6 | fi; | |
7 | 7 | |||
8 | if test "x$with_mpfr" != x; then | 8 | if test "x$with_mpfr" != x; then | |
9 | - gmplibs="-L$with_mpfr/lib $gmplibs" | 9 | - gmplibs="-L$with_mpfr/lib $gmplibs" | |
10 | + gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs" | 10 | + gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs" | |
11 | gmpinc="-I$with_mpfr/include" | 11 | gmpinc="-I$with_mpfr/include" | |
12 | fi | 12 | fi | |
13 | if test "x$with_mpfr_include" != x; then | 13 | if test "x$with_mpfr_include" != x; then | |
14 | @@ -4596,7 +4596,7 @@ | 14 | @@ -4544,8 +4544,10 @@ if test "x$with_mpfr_lib" != x; then | |
15 | gmplibs="-L$with_mpfr_lib $gmplibs" | |||
16 | fi | |||
17 | if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then | |||
18 | - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/.libs -L$$r/$(HOST_SUBDIR)/mpfr/_libs '"$gmplibs" | |||
19 | - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | |||
20 | + sdir= | |||
21 | + test -d "${srcdir}/mpfr/src" && sdir=/src | |||
22 | + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"${sdir}"'/.libs -L$$r/$(HOST_SUBDIR)/mpfr'"${sdir}/_libs $gmplibs" | |||
23 | + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"${sdir} "'-I$$s/mpfr'"${sdir} $gmpinc" | |||
24 | # Do not test the mpfr version. Assume that it is sufficient, since | |||
25 | # it is in the source tree, and the library has not been built yet | |||
26 | # but it would be included on the link line in the version check below | |||
27 | @@ -4598,7 +4600,7 @@ fi | |||
15 | if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then | 28 | if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then | |
16 | gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs" | 29 | gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/gmp/_libs '"$gmplibs" | |
17 | gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc" | 30 | gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc" | |
18 | - extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp' | 31 | - extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp' | |
19 | + extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/${HOST_SUBDIR}/gmp'"$lt_cv_objdir" | 32 | + extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/${HOST_SUBDIR}/gmp'"$lt_cv_objdir" | |
20 | # Do not test the gmp version. Assume that it is sufficient, since | 33 | # Do not test the gmp version. Assume that it is sufficient, since | |
21 | # it is in the source tree, and the library has not been built yet | 34 | # it is in the source tree, and the library has not been built yet | |
22 | # but it would be included on the link line in the version check below | 35 | # but it would be included on the link line in the version check below | |
23 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2011/12/22 14:14:22 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $ | |
2 | 2 | |||
3 | SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b | 3 | SHA1 (gcc-4.5.3.tar.bz2) = 73c45dfda5eef6b124be53e56828b5925198cc1b | |
4 | RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247 | 4 | RMD160 (gcc-4.5.3.tar.bz2) = d07aa90f2186b4e082dfd5ad5d5188c097fb6247 | |
5 | Size (gcc-4.5.3.tar.bz2) = 66374586 bytes | 5 | Size (gcc-4.5.3.tar.bz2) = 66374586 bytes | |
6 | SHA1 (patch-aa) = c488dc25e038d97c737c8c72437660598d9e15d3 | 6 | SHA1 (patch-aa) = c488dc25e038d97c737c8c72437660598d9e15d3 | |
7 | SHA1 (patch-ab) = 61bc2ebf150c6e471917e145d74e7795dc162194 | 7 | SHA1 (patch-ab) = 61bc2ebf150c6e471917e145d74e7795dc162194 | |
8 | SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee | 8 | SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee | |
9 | SHA1 (patch-ad) = e26ba1275f5dc294b4412c55ddb540712e705cb5 | 9 | SHA1 (patch-ad) = b72c93d8477a567363616717e20eef1b33e7d307 | |
10 | SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989 | 10 | SHA1 (patch-af) = 54fb9fb3438eb7c646b9d51b6b0cf3ded27d4989 | |
11 | SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b | 11 | SHA1 (patch-ag) = b58f8b82fcf17c60eb2700bc54d6625ca45e542b | |
12 | SHA1 (patch-ah) = a963394b0434b82494b7510d4b2705f77acfb668 | 12 | SHA1 (patch-ah) = a963394b0434b82494b7510d4b2705f77acfb668 | |
13 | SHA1 (patch-aj) = 7935c4c44b3942097129fdda2336de1ea0c83215 | 13 | SHA1 (patch-aj) = 7935c4c44b3942097129fdda2336de1ea0c83215 | |
14 | SHA1 (patch-ak) = 3d8a859ba436a4b204bb99f59cd5331d695aa811 | 14 | SHA1 (patch-ak) = 3d8a859ba436a4b204bb99f59cd5331d695aa811 |
@@ -1,13 +1,28 @@ | @@ -1,13 +1,28 @@ | |||
1 | $NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $ | 1 | $NetBSD: patch-ad,v 1.3 2012/05/03 12:20:19 hans Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-04-02 13:35:47.000000000 -0400 | 3 | --- configure.orig 2010-04-02 13:35:47.000000000 -0400 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -5395,7 +5395,7 @@ fi | 5 | @@ -5395,7 +5395,7 @@ fi | |
6 | 6 | |||
7 | 7 | |||
8 | if test "x$with_mpfr" != x; then | 8 | if test "x$with_mpfr" != x; then | |
9 | - gmplibs="-L$with_mpfr/lib $gmplibs" | 9 | - gmplibs="-L$with_mpfr/lib $gmplibs" | |
10 | + gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs" | 10 | + gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs" | |
11 | gmpinc="-I$with_mpfr/include $gmpinc" | 11 | gmpinc="-I$with_mpfr/include $gmpinc" | |
12 | fi | 12 | fi | |
13 | if test "x$with_mpfr_include" != x; then | 13 | if test "x$with_mpfr_include" != x; then | |
14 | @@ -5279,9 +5279,11 @@ if test "x$with_mpfr_lib" != x; then | |||
15 | gmplibs="-L$with_mpfr_lib $gmplibs" | |||
16 | fi | |||
17 | if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then | |||
18 | - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" | |||
19 | - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | |||
20 | - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" | |||
21 | + sdir= | |||
22 | + test -d "${srcdir}/mpfr/src" && sdir=/src | |||
23 | + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs" | |||
24 | + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc" | |||
25 | + extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir" | |||
26 | # Do not test the mpfr version. Assume that it is sufficient, since | |||
27 | # it is in the source tree, and the library has not been built yet | |||
28 | # but it would be included on the link line in the version check below |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2012/04/17 08:24:54 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.10 2012/05/03 12:20:19 hans Exp $ | |
2 | 2 | |||
3 | SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f | 3 | SHA1 (gcc-4.6.3.tar.bz2) = ce317ca5c8185b58bc9300182b534608c578637f | |
4 | RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 | 4 | RMD160 (gcc-4.6.3.tar.bz2) = 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 | |
5 | Size (gcc-4.6.3.tar.bz2) = 71999439 bytes | 5 | Size (gcc-4.6.3.tar.bz2) = 71999439 bytes | |
6 | SHA1 (patch-aa) = e68232cd14d6be31dd2c45aefb454dde75d0bbba | 6 | SHA1 (patch-aa) = e68232cd14d6be31dd2c45aefb454dde75d0bbba | |
7 | SHA1 (patch-ab) = 419dbd3e80b960ac391dba123d8de68abdd35355 | 7 | SHA1 (patch-ab) = 419dbd3e80b960ac391dba123d8de68abdd35355 | |
8 | SHA1 (patch-ac) = 0f708412670eca90c2c8e3fa675cffb14be768cd | 8 | SHA1 (patch-ac) = 0f708412670eca90c2c8e3fa675cffb14be768cd | |
9 | SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1 | 9 | SHA1 (patch-ad) = b5e17219e7b7ba158b9f3e1a67e155fb158b4484 | |
10 | SHA1 (patch-af) = e4e194ef29924eb986536972c5f5e9f37d98eba3 | 10 | SHA1 (patch-af) = e4e194ef29924eb986536972c5f5e9f37d98eba3 | |
11 | SHA1 (patch-ag) = 1753d08075de8527d8f14afc3df4afeacb10d507 | 11 | SHA1 (patch-ag) = 1753d08075de8527d8f14afc3df4afeacb10d507 | |
12 | SHA1 (patch-ah) = 8df9292331e68a69481aaabc894f285199a7eb05 | 12 | SHA1 (patch-ah) = 8df9292331e68a69481aaabc894f285199a7eb05 | |
13 | SHA1 (patch-ak) = 377d6ab5d454f0af2709680dd656f0449228aca9 | 13 | SHA1 (patch-ak) = 377d6ab5d454f0af2709680dd656f0449228aca9 | |
14 | SHA1 (patch-al) = 20d16fba8c1b9e578c9df6523397e29a94409990 | 14 | SHA1 (patch-al) = 20d16fba8c1b9e578c9df6523397e29a94409990 |
@@ -1,13 +1,28 @@ | @@ -1,13 +1,28 @@ | |||
1 | $NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $ | 1 | $NetBSD: patch-ad,v 1.3 2012/05/03 12:20:19 hans Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2011-03-16 18:27:36.000000000 +0000 | 3 | --- configure.orig 2011-03-16 18:27:36.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -5275,7 +5275,7 @@ fi | 5 | @@ -5269,7 +5269,7 @@ fi | |
6 | 6 | |||
7 | 7 | |||
8 | if test "x$with_mpfr" != x; then | 8 | if test "x$with_mpfr" != x; then | |
9 | - gmplibs="-L$with_mpfr/lib $gmplibs" | 9 | - gmplibs="-L$with_mpfr/lib $gmplibs" | |
10 | + gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs" | 10 | + gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs" | |
11 | gmpinc="-I$with_mpfr/include $gmpinc" | 11 | gmpinc="-I$with_mpfr/include $gmpinc" | |
12 | fi | 12 | fi | |
13 | if test "x$with_mpfr_include" != x; then | 13 | if test "x$with_mpfr_include" != x; then | |
14 | @@ -5279,9 +5279,11 @@ if test "x$with_mpfr_lib" != x; then | |||
15 | gmplibs="-L$with_mpfr_lib $gmplibs" | |||
16 | fi | |||
17 | if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then | |||
18 | - gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs" | |||
19 | - gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc" | |||
20 | - extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir" | |||
21 | + sdir= | |||
22 | + test -d "${srcdir}/mpfr/src" && sdir=/src | |||
23 | + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir $gmplibs" | |||
24 | + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr'"$sdir "'-I$$s/mpfr'"$sdir $gmpinc" | |||
25 | + extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr'"$sdir "'--with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr'"$sdir/$lt_cv_objdir" | |||
26 | # Do not test the mpfr version. Assume that it is sufficient, since | |||
27 | # it is in the source tree, and the library has not been built yet | |||
28 | # but it would be included on the link line in the version check below |
@@ -1,19 +1,20 @@ | @@ -1,19 +1,20 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2012/04/30 09:12:28 sbd Exp $ | 1 | $NetBSD: distinfo,v 1.5 2012/05/03 12:20:19 hans Exp $ | |
2 | 2 | |||
3 | SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 | 3 | SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449 | |
4 | RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a | 4 | RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a | |
5 | Size (ecj-4.5.jar) = 1470676 bytes | 5 | Size (ecj-4.5.jar) = 1470676 bytes | |
6 | SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82 | 6 | SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82 | |
7 | RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4 | 7 | RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4 | |
8 | Size (gcc-4.7.0.tar.bz2) = 82518546 bytes | 8 | Size (gcc-4.7.0.tar.bz2) = 82518546 bytes | |
9 | SHA1 (patch-configure) = 3482c45096a3c100c68c1b56947a12197b141292 | |||
9 | SHA1 (patch-gcc_Makefile.in) = 2372899a37259c89281e6bd1223e39df9b53a7e3 | 10 | SHA1 (patch-gcc_Makefile.in) = 2372899a37259c89281e6bd1223e39df9b53a7e3 | |
10 | SHA1 (patch-gcc_config.gcc) = 0fd91e83b97886589280d94457a71c0c551e93a3 | 11 | SHA1 (patch-gcc_config.gcc) = 0fd91e83b97886589280d94457a71c0c551e93a3 | |
11 | SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 | 12 | SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550 | |
12 | SHA1 (patch-gcc_fortran_f95-lang.c) = 06470dbee79f8c762675d3060a870b7dd9ba38f8 | 13 | SHA1 (patch-gcc_fortran_f95-lang.c) = 06470dbee79f8c762675d3060a870b7dd9ba38f8 | |
13 | SHA1 (patch-gcc_gcc.c) = f23ddf1ad4decd086dd41a70046b4a870a39516f | 14 | SHA1 (patch-gcc_gcc.c) = f23ddf1ad4decd086dd41a70046b4a870a39516f | |
14 | SHA1 (patch-gcc_ginclude_stddef.h) = 635e3e7579e9395fa017ac38e8b768d98937a80e | 15 | SHA1 (patch-gcc_ginclude_stddef.h) = 635e3e7579e9395fa017ac38e8b768d98937a80e | |
15 | SHA1 (patch-libgfortran_configure) = b3bbc7d9201073a1bed0b7e10141465bab52c8be | 16 | SHA1 (patch-libgfortran_configure) = b3bbc7d9201073a1bed0b7e10141465bab52c8be | |
16 | SHA1 (patch-libgo_Makefile.in) = c06e3f0deb9f906d2c158262cffdc3fb7af95602 | 17 | SHA1 (patch-libgo_Makefile.in) = c06e3f0deb9f906d2c158262cffdc3fb7af95602 | |
17 | SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a | 18 | SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a | |
18 | SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a | 19 | SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a | |
19 | SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297 | 20 | SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297 |
$NetBSD: patch-configure,v 1.1 2012/05/03 12:20:19 hans Exp $
--- configure.orig 2011-03-16 18:27:36.000000000 +0000
+++ configure
@@ -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