diff options
| -rw-r--r-- | lang/STk/files/patch-sum | 6 | ||||
| -rw-r--r-- | lang/STk/patches/patch-ac | 26 | ||||
| -rw-r--r-- | lang/STk/patches/patch-ad | 43 |
3 files changed, 58 insertions, 17 deletions
diff --git a/lang/STk/files/patch-sum b/lang/STk/files/patch-sum index df3b372bdb3..3b5eb2e1cd7 100644 --- a/lang/STk/files/patch-sum +++ b/lang/STk/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 2000/07/06 16:24:46 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.3 2000/09/26 02:02:32 hubertf Exp $ MD5 (patch-aa) = 74bd9dd240297e0bcbc82e8d6aac707f MD5 (patch-ab) = c317985bbf06feeffd0a998edd2ae8b8 -MD5 (patch-ac) = 57356c2542b2bf899597f5ed55546bf1 -MD5 (patch-ad) = 5c2213f3747941b72224df61fce789d2 +MD5 (patch-ac) = de0be77e335c022e564faaff29364d17 +MD5 (patch-ad) = fa602c5c325c5da1cb9ed6e9c6f70d1d diff --git a/lang/STk/patches/patch-ac b/lang/STk/patches/patch-ac index 11f2a94e5ed..dae34d19e9a 100644 --- a/lang/STk/patches/patch-ac +++ b/lang/STk/patches/patch-ac @@ -1,14 +1,26 @@ -$NetBSD: patch-ac,v 1.1 2000/07/06 16:24:49 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2000/09/26 02:02:33 hubertf Exp $ -allow sharing between different arch's which use the same processor -Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc. - ---- configure.in.orig Sat Jun 6 08:19:03 1998 -+++ configure.in Thu Jul 6 10:24:09 2000 -@@ -15,5 +15,5 @@ +--- configure.in.orig Sat Jun 6 14:19:03 1998 ++++ configure.in +@@ -14,7 +14,11 @@ + # determine the kind of the machine which is running this script os=`uname -s` version=`uname -r` -machine=`uname -m` ++# ++# NetBSD: ++# allow sharing between different arch's which use the same processor ++# Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc. +machine=`uname -p` case $os in + Linux*) +@@ -125,7 +129,7 @@ + + if test "$x_libraries" != "" + then +- XLIBSW="-L$x_libraries" ++ XLIBSW="-L$x_libraries -Wl,-R$x_libraries" + fi + + XLIBSW="$XLIBSW $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" diff --git a/lang/STk/patches/patch-ad b/lang/STk/patches/patch-ad index 221e2f2c2c5..9cd7d7299ec 100644 --- a/lang/STk/patches/patch-ad +++ b/lang/STk/patches/patch-ad @@ -1,14 +1,43 @@ -$NetBSD: patch-ad,v 1.1 2000/07/06 16:24:49 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.2 2000/09/26 02:02:33 hubertf Exp $ -allow sharing between different arch's which use the same processor -Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc. - ---- configure.orig Sat Jun 6 08:19:03 1998 -+++ configure Thu Jul 6 10:23:59 2000 -@@ -554,5 +554,5 @@ +--- configure.orig Sat Jun 6 14:19:03 1998 ++++ configure +@@ -553,7 +553,10 @@ + # determine the kind of the machine which is running this script os=`uname -s` version=`uname -r` -machine=`uname -m` ++# NetBSD: ++# allow sharing between different arch's which use the same processor ++# Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc. +machine=`uname -p` case $os in + Linux*) +@@ -969,7 +972,7 @@ + # just checking for Solaris. + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then +- X_LIBS="$X_LIBS -L$x_libraries" ++ X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries" + if test "`(uname) 2>/dev/null`" = SunOS && + uname -r | grep '^5' >/dev/null; then + X_LIBS="$X_LIBS -R $x_libraries" +@@ -979,7 +982,7 @@ + # Check for libraries that X11R6 Xt/Xaw programs need. + + ac_save_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -L$x_libraries" ++ LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. +@@ -1193,7 +1196,7 @@ + + if test "$x_libraries" != "" + then +- XLIBSW="-L$x_libraries" ++ XLIBSW="-Wl,-R$x_libraries -L$x_libraries" + fi + + XLIBSW="$XLIBSW $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" |