Use COMPILER_RPATH_FLAG instead of -Wl,-R.

Fixes OS X build.
From Kai-Uwe Eckhardt.

6 files changed, 13 insertions, 13 deletions

diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 83438268b5e..f549dbace4c 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2011/07/11 23:26:32 wiz Exp $
+$NetBSD: distinfo,v 1.10 2011/12/22 14:14:22 wiz Exp $
 
 SHA1 (gcc-4.4.6.tar.bz2) = fc5e6c60b03650f6508470c088440d3d9360adf9
 RMD160 (gcc-4.4.6.tar.bz2) = b35f81ee9540cc4ad0d2f970643f8053f058feec
@@ -6,7 +6,7 @@ Size (gcc-4.4.6.tar.bz2) = 63135296 bytes
 SHA1 (patch-aa) = b90dbd935aa105b86a7dd0f3f5f76727bd2d55fb
 SHA1 (patch-ab) = e254456a6da7090f7ba37d3b55a17be2dd157f88
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = 86dc05e6ea977ad869e5d63beb493750ab01a807
+SHA1 (patch-ad) = ea1f9e8b49bd4498812ef8d5f47baf8410794fd3
 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 5ff931b7556..79f4260d095 100644
--- a/lang/gcc44/patches/patch-ad
+++ b/lang/gcc44/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/09/18 11:24:50 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
 
---- configure.orig	2009-04-21 11:08:08 +0200
+--- configure.orig	2010-10-02 11:40:32.000000000 +0000
 +++ configure
 @@ -4532,7 +4532,7 @@ if test "${with_mpfr_lib+set}" = set; th
  fi;
  
  if test "x$with_mpfr" != x; then
 -  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-L$with_mpfr/lib -Wl,-R${PREFIX}/lib $gmplibs"
++  gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs"
    gmpinc="-I$with_mpfr/include"
  fi
  if test "x$with_mpfr_include" != x; then
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index e11b9b3f064..2905da0545c 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2011/10/18 17:55:27 hans Exp $
+$NetBSD: distinfo,v 1.4 2011/12/22 14:14:22 wiz 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) = 55b5303b494dbef323bd59464c7c14863f81c6e3
+SHA1 (patch-ad) = e26ba1275f5dc294b4412c55ddb540712e705cb5
 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 47e8e5fec08..b63d6fdcfb6 100644
--- a/lang/gcc45/patches/patch-ad
+++ b/lang/gcc45/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/05/14 20:19:47 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
 
 --- configure.orig	2010-04-02 13:35:47.000000000 -0400
 +++ configure
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2011/05/14 20:19:47 wiz Exp $
  
  if test "x$with_mpfr" != x; then
 -  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-L$with_mpfr/lib -Wl,-R${PREFIX}/lib $gmplibs"
++  gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs"
    gmpinc="-I$with_mpfr/include $gmpinc"
  fi
  if test "x$with_mpfr_include" != x; then
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 0e0fface4d8..c060709d3bf 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/10/31 19:37:31 sbd Exp $
+$NetBSD: distinfo,v 1.5 2011/12/22 14:14:22 wiz Exp $
 
 SHA1 (gcc-4.6.2.tar.bz2) = 691974613b1c1f15ed0182ec539fa54a12dd6f93
 RMD160 (gcc-4.6.2.tar.bz2) = e7041933b39629f9524848dcf81a1a4c02a225c6
@@ -6,7 +6,7 @@ Size (gcc-4.6.2.tar.bz2) = 71995338 bytes
 SHA1 (patch-aa) = 801b340bb24586c84b09f53161a7aced141ab9d9
 SHA1 (patch-ab) = f69d2db611aee1d31b7872bbf59d2b651413b3d3
 SHA1 (patch-ac) = 5e4c05ac8cac376b2c4c33db90d3b309a11cedee
-SHA1 (patch-ad) = 42894f37b20f85e601b941a8fea99d2af3f8b6c7
+SHA1 (patch-ad) = cd560eba165fe0c8d43a336d6674bdc95cd00fb1
 SHA1 (patch-af) = fb06bce10adc88d3f6829f41a91f4612a72434fd
 SHA1 (patch-ag) = 4b82b06880bdccc3f967c8633e957fef4509dbc1
 SHA1 (patch-ah) = 7bddb8424dfcbce3e0cf1d856f851d827b66303c
diff --git a/lang/gcc46/patches/patch-ad b/lang/gcc46/patches/patch-ad
index 8557b470448..c02f6df0c06 100644
--- a/lang/gcc46/patches/patch-ad
+++ b/lang/gcc46/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2011/12/22 14:14:22 wiz Exp $
 
 --- configure.orig	2011-03-16 18:27:36.000000000 +0000
 +++ configure
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2011/05/15 00:09:56 wiz Exp $
  
  if test "x$with_mpfr" != x; then
 -  gmplibs="-L$with_mpfr/lib $gmplibs"
-+  gmplibs="-L$with_mpfr/lib -Wl,-R${PREFIX}/lib $gmplibs"
++  gmplibs="-L$with_mpfr/lib ${COMPILER_RPATH_FLAG}$with_mpfr/lib $gmplibs"
    gmpinc="-I$with_mpfr/include $gmpinc"
  fi
  if test "x$with_mpfr_include" != x; then