diff options
| author | jwise <jwise> | 2000-08-31 16:48:11 +0000 |
|---|---|---|
| committer | jwise <jwise> | 2000-08-31 16:48:11 +0000 |
| commit | a45cd60718fc3158910417e753ec0c34f44c3b10 (patch) | |
| tree | 0a643907c5d0341a0c9d834b67652ef89c3f49a2 | |
| parent | 436d257aef2ce7c7999afcc4c3de234d2f076d3c (diff) | |
| download | pkgsrc-a45cd60718fc3158910417e753ec0c34f44c3b10.tar.gz | |
Fix inconsistent use of SHLIB_SUFFIX vs. SHARED_LIB_SUFFIX in configure
script. I believe this is what resulted in 1.4.3/ELF ports not building
tk correctly. he is testing on 1.4.3_ALPHA/alpha.
| -rw-r--r-- | x11/tk/patches/patch-ab | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab index 5488e854da4..d1b42278a6d 100644 --- a/x11/tk/patches/patch-ab +++ b/x11/tk/patches/patch-ab @@ -1,7 +1,15 @@ -$NetBSD: patch-ab,v 1.2 2000/08/30 20:22:36 jwise Exp $ +$NetBSD: patch-ab,v 1.3 2000/08/31 16:48:11 jwise Exp $ --- configure.orig Tue Aug 8 15:19:32 2000 -+++ configure Tue Aug 29 10:06:15 2000 -@@ -3338,7 +3338,7 @@ ++++ configure Thu Aug 31 12:35:15 2000 +@@ -1873,6 +1873,7 @@ + SHLIB_LD="ld -Bshareable -x" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" ++ SHARED_LIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="" +@@ -3338,7 +3339,7 @@ for i in $dirs ; do if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then echo "$ac_t""$i" 1>&6 @@ -10,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2000/08/30 20:22:36 jwise Exp $ x_libraries="$i" break fi -@@ -3347,7 +3347,7 @@ +@@ -3347,7 +3348,7 @@ if test "$x_libraries" = ""; then XLIBSW=-lX11 else @@ -19,7 +27,7 @@ $NetBSD: patch-ab,v 1.2 2000/08/30 20:22:36 jwise Exp $ fi fi if test "$XLIBSW" = nope ; then -@@ -4088,7 +4088,7 @@ +@@ -4088,7 +4089,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}" TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX} @@ -28,7 +36,7 @@ $NetBSD: patch-ab,v 1.2 2000/08/30 20:22:36 jwise Exp $ RANLIB=":" # TCL_STUB_FLAGS="-DUSE_TCL_STUBS" -@@ -4114,8 +4114,8 @@ +@@ -4114,8 +4115,8 @@ else eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" fi |