Rpath is a linker option, prefix it with -Wl when necessary.

2 files changed, 81 insertions, 1 deletions

diff --git a/lang/clisp/distinfo b/lang/clisp/distinfo
index 174b81de375..4a48d4ea4d6 100644
--- a/lang/clisp/distinfo
+++ b/lang/clisp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2013/06/18 19:58:20 joerg Exp $
+$NetBSD: distinfo,v 1.28 2013/10/26 22:03:49 joerg Exp $
 
 SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323
 RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76
@@ -6,4 +6,5 @@ Size (clisp-2.49.tar.gz) = 9823111 bytes
 SHA1 (patch-aa) = 1a0af21eb2c2de898a7cb3500ce72f15581bfeb8
 SHA1 (patch-ab) = 225873ed24e4a1f343acc8e3163c8151e9958c77
 SHA1 (patch-ac) = c31fcd65d7d37aeaf69c0eee9499bff596b6619b
+SHA1 (patch-src_configure) = 3bd4462cf8bb54ec68e03dd10076b4b09a172fc7
 SHA1 (patch-src_lispbibl.d) = 122cdcc570065b7518b391d9433c5994c3925880
diff --git a/lang/clisp/patches/patch-src_configure b/lang/clisp/patches/patch-src_configure
new file mode 100644
index 00000000000..b5cd4308f0b
--- /dev/null
+++ b/lang/clisp/patches/patch-src_configure
@@ -0,0 +1,79 @@
+$NetBSD: patch-src_configure,v 1.1 2013/10/26 22:03:50 joerg Exp $
+
+--- src/configure.orig	2010-07-07 17:22:03.000000000 +0000
++++ src/configure
+@@ -17045,7 +17045,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBSIGSEGV="${LTLIBSIGSEGV}${LTLIBSIGSEGV:+ }-R$found_dir"
++      LTLIBSIGSEGV="${LTLIBSIGSEGV}${LTLIBSIGSEGV:+ }${COMPILER_RPATH_FLAG}$found_dir"
+     done
+   fi
+ 
+@@ -20036,7 +20036,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
++      LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }${COMPILER_RPATH_FLAG}$found_dir"
+     done
+   fi
+ 
+@@ -21458,7 +21458,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
++      LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }${COMPILER_RPATH_FLAG}$found_dir"
+     done
+   fi
+ 
+@@ -22136,7 +22136,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBAVCALL="${LTLIBAVCALL}${LTLIBAVCALL:+ }-R$found_dir"
++      LTLIBAVCALL="${LTLIBAVCALL}${LTLIBAVCALL:+ }${COMPILER_RPATH_FLAG}$found_dir"
+     done
+   fi
+ 
+@@ -22650,7 +22650,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBCALLBACK="${LTLIBCALLBACK}${LTLIBCALLBACK:+ }-R$found_dir"
++      LTLIBCALLBACK="${LTLIBCALLBACK}${LTLIBCALLBACK:+ }${COMPILER_RPATH_FLAG}$found_dir"
+     done
+   fi
+ 
+@@ -23566,9 +23566,9 @@ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-       X_LIBS="$X_LIBS -R$x_libraries"
++       X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+ else
+-  LIBS="$ac_xsave_LIBS -R $x_libraries"
++  LIBS="$ac_xsave_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -23583,7 +23583,7 @@ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	  X_LIBS="$X_LIBS -R $x_libraries"
++	  X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries"
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+ $as_echo "neither works" >&6; }
+@@ -29120,7 +29120,7 @@ fi
+   fi
+   if test "X$ltrpathdirs" != "X"; then
+             for found_dir in $ltrpathdirs; do
+-      LTLIBREADLINE="${LTLIBREADLINE}${LTLIBREADLINE:+ }-R$found_dir"
++      LTLIBREADLINE="${LTLIBREADLINE}${LTLIBREADLINE:+ }${COMPILER_RPATH_FLAG}$found_dir"
+     done
+   fi
+