Fix rpath options to use -Wl prefix.

2 files changed, 8 insertions, 8 deletions

diff --git a/parallel/sge/distinfo b/parallel/sge/distinfo
index 4e45f03b237..63907bf9ab1 100644
--- a/parallel/sge/distinfo
+++ b/parallel/sge/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.16 2013/05/23 18:41:48 joerg Exp $
+$NetBSD: distinfo,v 1.17 2013/10/20 17:57:32 joerg Exp $
 
 SHA1 (sge-8.0.0d.tar.gz) = e7500bbeec4075d054410f7465011efb61e93def
 RMD160 (sge-8.0.0d.tar.gz) = aa83db459f4bbbebd7d2cc81290b7b8cb0818210
 Size (sge-8.0.0d.tar.gz) = 12289130 bytes
 SHA1 (patch-ad) = 004600f060b5fcacd91ba68808686c0a679889f6
 SHA1 (patch-ag) = 57eb4296e531f3a47b95c8842e0db0575870dcf0
-SHA1 (patch-am) = 1d367d541ec68d1c5618e3c594c5ce2db88a277e
+SHA1 (patch-am) = d361698129c0396ee224d48872d680b7084c2a1e
 SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
 SHA1 (patch-bd) = aae1bdccfb81712c504b3add8b9728a2bcf3d1dd
 SHA1 (patch-bl) = f04f92c1a1c69443e9336f9fcbe7d988001f6681
diff --git a/parallel/sge/patches/patch-am b/parallel/sge/patches/patch-am
index d9bb6d327a1..5785da88fd9 100644
--- a/parallel/sge/patches/patch-am
+++ b/parallel/sge/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.8 2012/04/15 04:07:21 markd Exp $
+$NetBSD: patch-am,v 1.9 2013/10/20 17:57:32 joerg Exp $
 
 Pkgsrc stuff
 GridEngine dev mailing list patch for "nbsd-1" issue
@@ -11,7 +11,7 @@ ArchLinux static crypto also needs libz.a
     set CFLAGS        = "-I$BERKELEYDB_HOME/include/${BDB_INCLUDE_SUBDIR} $CFLAGS"
     set LFLAGS        = "-L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} $LFLAGS"
 -   set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR}"
-+   set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} -R$BERKELEYDB_HOME/lib"
++   set SHARED_LFLAGS = "$SHARED_LFLAGS -L$BERKELEYDB_HOME/lib/${BDB_LIB_SUBDIR} ${COMPILER_RPATH_FLAG}$BERKELEYDB_HOME/lib"
  endif
  set CFLAGS = "$CFLAGS -DSPOOLING_$SPOOLING_METHOD $SECFLAGS"
  
@@ -23,7 +23,7 @@ ArchLinux static crypto also needs libz.a
 +   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
     set XCFLAGS  = "-DNeedFunctionPrototypes -DNeedVarargsPrototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L$MOTIFHOME/lib -L/usr/X11R6/lib"
-+   set XLIBD    = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib -R${X11BASE}/lib"
++   set XLIBD    = "-L$MOTIFHOME/lib -R${MOTIFHOME}/lib -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
     set XLIBS    = "-lXm -lXpm -lXt -lXext -lX11 -lSM -lICE"
     if ("$ADOC" == 1) then
        set CFLAGS = "$CFLAGS -Wno-error"
@@ -44,7 +44,7 @@ ArchLinux static crypto also needs libz.a
 +   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib"
-+   set XLIBD    = "-L${X11BASE}/lib -R${X11BASE}/lib"
++   set XLIBD    = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAGS}${X11BASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -Xlinker -lXm -Xlinker -Bdynamic -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM	= "rm -f"
@@ -56,7 +56,7 @@ ArchLinux static crypto also needs libz.a
 +   set CFLAGS   = "$OFLAG -Wall -DNETBSD -D$BUILDARCH -DGETHOSTBYNAME_M -DGETHOSTBYADDR_M $DEBUG_FLAG $CFLAGS -I${X11BASE}/include"
     set NOERR_CFLAG = "-Wno-error"
 -   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic"
-+   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
++   set LFLAGS   = "$DEBUG_FLAG $LFLAGS -export-dynamic -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"
     set LIBS     = "$LIBS -lkvm"
     set SHAREDLD = $CC
     set SHARED_CFLAGS = "-fPIC"
@@ -68,7 +68,7 @@ ArchLinux static crypto also needs libz.a
 +   set XINCD    = "$XMTINCD $XINCD -I${X11BASE}/include"
     set XCFLAGS  = "-Wno-strict-prototypes -Wno-error $XMTDEF $XINCD"
 -   set XLIBD    = "-L/usr/X11R6/lib -R/usr/X11R6/lib -L/usr/pkg/lib -R /usr/pkg/lib"
-+   set XLIBD    = "-L${X11BASE}/lib -R${X11BASE}/lib -L${LOCALBASE}/lib -R${LOCALBASE}/lib"
++   set XLIBD    = "-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib"
     set XLFLAGS  = "$XLIBD"
     set XLIBS    = " -lXm -lXpm -lXt -lXext -lX11 -lSM -lICE -lXp"
     set RM       = "rm -f"