Pass rpath options with correct -Wl prefix.

2 files changed, 66 insertions, 5 deletions

diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo
index 60ddb03fd05..ffd25acf9a1 100644
--- a/security/mit-krb5/distinfo
+++ b/security/mit-krb5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.45 2013/08/30 12:59:22 joerg Exp $
+$NetBSD: distinfo,v 1.46 2013/10/20 17:56:02 joerg Exp $
 
 SHA1 (krb5-1.10.6-signed.tar) = e998a54d9ddf64b13e839873c7e3c7a1077c4bac
 RMD160 (krb5-1.10.6-signed.tar) = ac1fb2e4096f4e8c0010678c06fd551924dbae56
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 941848a1773dfbe51dff3134d4b8504a850a958d
 SHA1 (patch-ad) = b56a7218007560470179dd811c84b8c690c966ac
 SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd
 SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf
-SHA1 (patch-ag) = 48c0ce35324f5757134c1c5da666bb0cb7a3aaa6
+SHA1 (patch-ag) = 69daa2cf6b231eeb7c9ed57a41bb7b800f6b926f
 SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba
 SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6
 SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46
diff --git a/security/mit-krb5/patches/patch-ag b/security/mit-krb5/patches/patch-ag
index fd73aa0e867..511130a1806 100644
--- a/security/mit-krb5/patches/patch-ag
+++ b/security/mit-krb5/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2012/07/16 19:12:33 adam Exp $
+$NetBSD: patch-ag,v 1.8 2013/10/20 17:56:02 joerg Exp $
 
 Add --enable-pkgsrc-libtool option
 
---- config/shlib.conf.orig	2012-05-31 23:49:44.000000000 +0000
+--- config/shlib.conf.orig	2013-06-05 22:53:29.000000000 +0000
 +++ config/shlib.conf
 @@ -22,6 +22,7 @@ SHLIBVEXT=.so.v-nobuild
  SHLIBSEXT=.so.s-nobuild
@@ -20,7 +20,16 @@ Add --enable-pkgsrc-libtool option
  # Default for systems w/o shared libraries
  CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
-@@ -287,7 +289,7 @@ mips-*-netbsd*)
+@@ -274,7 +276,7 @@ mips-*-netbsd*)
+ 	SHLIBSEXT='.so.$(LIBMAJOR)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -shared -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	RPATH_FLAG='-Wl,-rpath -Wl,'
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+@@ -287,14 +289,14 @@ mips-*-netbsd*)
  	PROFFLAGS=-pg
  	;;
  
@@ -29,6 +38,36 @@ Add --enable-pkgsrc-libtool option
  	PICFLAGS=-fPIC
  	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
  	SHLIBEXT=.so
+ 	LDCOMBINE='$(CC) -shared'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+-	RPATH_FLAG=-R
++	RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+@@ -324,7 +326,7 @@ mips-*-netbsd*)
+ 	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -Bshareable'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ 	CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)'
+@@ -338,9 +340,9 @@ mips-*-netbsd*)
+ 	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -Bshareable'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+-	RPATH_FLAG=-R
++	RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
 @@ -367,7 +369,7 @@ mips-*-netbsd*)
  	for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do
  	    LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib"
@@ -38,6 +77,28 @@ Add --enable-pkgsrc-libtool option
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  	CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)'
+@@ -399,10 +401,10 @@ mips-*-netbsd*)
+ 	SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+ 	SHLIBSEXT='.so.$(LIBMAJOR)'
+ 	SHLIBEXT=.so
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	PROFFLAGS=-pg
+-	RPATH_FLAG=-R
++	RPATH_FLAG=${COMPILER_RPATH_FLAG}
+ 	PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(PURE) $(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
+ 	CC_LINK_STATIC='$(PURE) $(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+@@ -454,7 +456,7 @@ mips-*-netbsd*)
+ 	SHLIBVEXT='.so.$(LIBMAJOR)'
+ 	SHLIBEXT=.so
+ 	LDCOMBINE='ld -Bshareable'
+-	SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)'
++	SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
+ 	SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	PROG_RPATH_FLAGS='-Wl,-rpath,$(PROG_RPATH)'
+ 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS)'
 @@ -486,7 +488,7 @@ mips-*-netbsd*)
  	# Assume initialization always delayed.
  	INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done'