Pass rpath options with correct -Wl prefix.

3 files changed, 80 insertions, 1 deletions

diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index b1651844d79..94937214339 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2013/09/30 06:24:09 obache Exp $
+$NetBSD: distinfo,v 1.28 2013/10/20 17:56:02 joerg Exp $
 
 SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
 RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
@@ -6,6 +6,8 @@ Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
 SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = a3913afc26a37cd6e4681c7bf1e09db001c15d57
 RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = 8228d02e2b2cbb54da77d7767f8b9951c3423349
 Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch) = 3836 bytes
+SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf
+SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7
 SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6
 SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
 SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab
diff --git a/security/cyrus-sasl/patches/patch-configure b/security/cyrus-sasl/patches/patch-configure
new file mode 100644
index 00000000000..5579a69e111
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-configure
@@ -0,0 +1,49 @@
+$NetBSD: patch-configure,v 1.1 2013/10/20 17:56:02 joerg Exp $
+
+--- configure.orig	2013-10-20 15:45:41.000000000 +0000
++++ configure
+@@ -4346,9 +4346,9 @@ if test "${andrew_cv_runpath_switch+set}
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-    # first, try -R
++    # first, try ${COMPILER_RPATH_FLAG}
+     SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
++    LDFLAGS="${COMPILER_RPATH_FLAG} /usr/lib"
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4385,7 +4385,7 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  andrew_cv_runpath_switch="-R"
++  andrew_cv_runpath_switch="${COMPILER_RPATH_FLAG}"
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14591,9 +14591,9 @@ case "$with_sqlite" in
+ $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -14721,9 +14721,9 @@ case "$with_sqlite3" in
+ $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
diff --git a/security/cyrus-sasl/patches/patch-configure.in b/security/cyrus-sasl/patches/patch-configure.in
new file mode 100644
index 00000000000..4a9b30d34d8
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-configure.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure.in,v 1.1 2013/10/20 17:56:02 joerg Exp $
+
+--- configure.in.orig	2013-10-20 15:45:39.000000000 +0000
++++ configure.in
+@@ -861,9 +861,9 @@ case "$with_sqlite" in
+     notfound) AC_WARN([SQLite Library not found]); true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +913,9 @@ case "$with_sqlite3" in
+     notfound) AC_WARN([SQLite3 Library not found]); true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3