From 1750f7c4d58b3100af4b846533deeb1029ebf090 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sun, 27 Oct 2013 20:35:16 +0000
Subject: When extracting rpath options from the Fortran linker, qualify them
 with -Wl before passing them to CC.

---
 math/octave/distinfo                |  3 ++-
 math/octave/patches/patch-configure | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 math/octave/patches/patch-configure

(limited to 'math/octave')

diff --git a/math/octave/distinfo b/math/octave/distinfo
index 9b6c1bd6428..873848bf30b 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.37 2013/09/15 12:30:55 joerg Exp $
+$NetBSD: distinfo,v 1.38 2013/10/27 20:35:16 joerg Exp $
 
 SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4
 RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95
 Size (octave-3.6.4.tar.bz2) = 15627315 bytes
+SHA1 (patch-configure) = 627b8868d2cdd3c3a44e1485c8e7c47f481ca63e
 SHA1 (patch-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512
 SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9
 SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d
diff --git a/math/octave/patches/patch-configure b/math/octave/patches/patch-configure
new file mode 100644
index 00000000000..694d2f971b6
--- /dev/null
+++ b/math/octave/patches/patch-configure
@@ -0,0 +1,18 @@
+$NetBSD: patch-configure,v 1.1 2013/10/27 20:35:16 joerg Exp $
+
+--- configure.orig	2013-10-27 16:08:37.000000000 +0000
++++ configure
+@@ -33819,7 +33819,12 @@ else
+ fi
+ 	  done
+ 	  ;;
+-	-[lLR]*)
++	-R*)
++	  ac_arg="-Wl,$ac_arg"
++	  shift
++	  set X $ac_arg "$@"
++	  ;;
++	-[lLR]*|-Wl*)
+ 	    ac_exists=false
+   for ac_i in $ac_cv_f77_libs; do
+     if test x"$ac_arg" = x"$ac_i"; then
-- 
cgit v1.2.3