summaryrefslogtreecommitdiff
path: root/lang/tcl/patches/patch-ab
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl/patches/patch-ab')
-rw-r--r--lang/tcl/patches/patch-ab400
1 files changed, 390 insertions, 10 deletions
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index 9cf7af11e08..d2c86a091ed 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
+$NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
---- configure.orig 2004-03-01 17:58:59.000000000 -0600
+--- configure.orig Mon Mar 1 18:58:59 2004
+++ configure
@@ -5613,6 +5613,7 @@ fi
# Step 3: set configuration options based on system name and version.
@@ -10,19 +10,136 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -6038,6 +6039,9 @@ fi
+@@ -5682,7 +5683,7 @@ fi
+ SHLIB_SUFFIX=".so"
+
+ DL_OBJS="tclLoadDl.o"
+- LDFLAGS=""
++ LD_FLAGS=""
+
+ LD_LIBRARY_PATH_VAR="LIBPATH"
+
+@@ -5693,7 +5694,7 @@ fi
+ else
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+- LDFLAGS="-q64"
++ LD_FLAGS="-q64"
+ RANLIB="${RANLIB} -X64"
+ AR="${AR} -X64"
+ SHLIB_LD_FLAGS="-b64"
+@@ -5734,7 +5735,7 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ LD_LIBRARY_PATH_VAR="LIBPATH"
+@@ -5754,7 +5755,7 @@ fi
+ else
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+- LDFLAGS="-q64"
++ LD_FLAGS="-q64"
+ RANLIB="${RANLIB} -X64"
+ AR="${AR} -X64"
+ SHLIB_LD_FLAGS="-b64"
+@@ -5830,7 +5831,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -5841,7 +5842,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS="-export-dynamic"
++ LD_FLAGS="-export-dynamic"
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -5852,7 +5853,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -5916,7 +5917,7 @@ fi
+ SHLIB_LD_LIBS='${LIBS}'
+ DL_OBJS="tclLoadShl.o"
+ DL_LIBS="-ldld"
+- LDFLAGS="-Wl,-E"
++ LD_FLAGS="-Wl,-E"
+ CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+ LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+@@ -5952,10 +5953,10 @@ fi
+ do64bit_ok=yes
+ if test "`uname -m`" = "ia64" ; then
+ EXTRA_CFLAGS="+DD64"
+- LDFLAGS="+DD64 $LDFLAGS"
++ LD_FLAGS="+DD64 $LD_FLAGS"
+ else
+ EXTRA_CFLAGS="+DA2.0W"
+- LDFLAGS="+DA2.0W $LDFLAGS"
++ LD_FLAGS="+DA2.0W $LD_FLAGS"
+ fi
+ fi
+ fi
+@@ -6009,7 +6010,7 @@ fi
+ SHLIB_LD_LIBS=""
+ DL_OBJS="tclLoadShl.o"
+ DL_LIBS="-ldld"
+- LDFLAGS="-Wl,-E"
++ LD_FLAGS="-Wl,-E"
+ CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
+ LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
+ LD_LIBRARY_PATH_VAR="SHLIB_PATH"
+@@ -6022,7 +6023,7 @@ fi
+ SHLIB_LD_LIBS='${LIBS}'
+ DL_OBJS="tclLoadAout.o"
+ DL_LIBS=""
+- LDFLAGS="-Wl,-D,08000000"
++ LD_FLAGS="-Wl,-D,08000000"
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
+@@ -6037,7 +6038,10 @@ fi
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
EXTRA_CFLAGS=""
- LDFLAGS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ TCL_LIB_VERSIONS_OK=nodots
;;
IRIX-6.*)
SHLIB_CFLAGS=""
-@@ -6063,6 +6067,9 @@ fi
+@@ -6050,7 +6054,7 @@ fi
+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ if test "$GCC" = "yes" ; then
+ EXTRA_CFLAGS="-mabi=n32"
+- LDFLAGS="-mabi=n32"
++ LD_FLAGS="-mabi=n32"
+ else
+ case $system in
+ IRIX-6.3)
+@@ -6061,8 +6065,11 @@ fi
+ EXTRA_CFLAGS="-n32"
+ ;;
esac
- LDFLAGS="-n32"
+- LDFLAGS="-n32"
++ LD_FLAGS="-n32"
fi
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -30,8 +147,21 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -6087,6 +6094,9 @@ fi
- LDFLAGS="-64"
+@@ -6071,7 +6078,7 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+
+@@ -6084,9 +6091,12 @@ fi
+ do64bit_ok=yes
+ SHLIB_LD="ld -64 -shared -rdata_shared"
+ EXTRA_CFLAGS="-64"
+- LDFLAGS="-64"
++ LD_FLAGS="-64"
fi
fi
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -40,6 +170,24 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
+@@ -6103,7 +6113,7 @@ fi
+ SHLIB_LD="${CC} -shared"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS="-rdynamic"
++ LD_FLAGS="-rdynamic"
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ else
+@@ -6139,7 +6149,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+ SHLIB_LD="ld -shared"
+ DL_OBJS="tclLoadDld.o"
+ DL_LIBS="-ldld"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ else
@@ -6168,6 +6178,9 @@ fi
EOF
@@ -50,7 +198,40 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -6249,6 +6262,9 @@ fi
+@@ -6178,7 +6191,7 @@ EOF
+ SHLIB_LD="${CC} -shared"
+ DL_OBJS=""
+ DL_LIBS="-ldl"
+- LDFLAGS="-rdynamic"
++ LD_FLAGS="-rdynamic"
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ else
+@@ -6214,7 +6227,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+ SHLIB_LD="ld -shared"
+ DL_OBJS=""
+ DL_LIBS="-ldld"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ else
+@@ -6233,7 +6246,7 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -6244,11 +6257,14 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS="-Wl,-Bexport"
++ LD_FLAGS="-Wl,-Bexport"
+ CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -69,7 +250,8 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
- LDFLAGS=""
+- LDFLAGS=""
++ LD_FLAGS=""
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
echo $ac_n "checking for ELF""... $ac_c" 1>&6
@@ -104,6 +286,166 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
+@@ -6323,7 +6346,7 @@ else
+ SHLIB_SUFFIX=".a"
+ DL_OBJS="tclLoadAout.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+@@ -6344,14 +6367,14 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS="-export-dynamic"
++ LD_FLAGS="-export-dynamic"
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ if test "${TCL_THREADS}" = "1" ; then
+ # The -pthread needs to go in the CFLAGS, not LIBS
+ LIBS=`echo $LIBS | sed s/-pthread//`
+ EXTRA_CFLAGS="-pthread"
+- LDFLAGS="$LDFLAGS -pthread"
++ LD_FLAGS="$LD_FLAGS -pthread"
+ fi
+ case $system in
+ FreeBSD-3.*)
+@@ -6372,7 +6395,7 @@ fi
+ DL_OBJS="tclLoadDyld.o"
+ PLAT_OBJS="tclMacOSXBundle.o"
+ DL_LIBS=""
+- LDFLAGS="-prebind"
++ LD_FLAGS="-prebind"
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ CFLAGS_OPTIMIZE="-Os"
+@@ -6389,7 +6412,7 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadNext.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -6409,7 +6432,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadOSF.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -6425,7 +6448,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -6441,7 +6464,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ if test "$GCC" = "yes" ; then
+@@ -6458,7 +6481,7 @@ EOF
+ LIBS="$LIBS -lpthread -lmach -lexc"
+ else
+ EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
+- LDFLAGS="-pthread"
++ LD_FLAGS="-pthread"
+ fi
+ fi
+
+@@ -6473,7 +6496,7 @@ EOF
+ DL_OBJS="tclLoadDl.o"
+ # dlopen is in -lc on QNX
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -6484,7 +6507,7 @@ EOF
+ SHLIB_SUFFIX=".a"
+ DL_OBJS="tclLoadAout.o"
+ DL_LIBS=""
+- LDFLAGS="-Wl,-D,08000000"
++ LD_FLAGS="-Wl,-D,08000000"
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ ;;
+@@ -6494,10 +6517,10 @@ EOF
+ # below.
+ if test "$GCC" = "yes" ; then
+ SHLIB_CFLAGS="-fPIC -melf"
+- LDFLAGS="-melf -Wl,-Bexport"
++ LD_FLAGS="-melf -Wl,-Bexport"
+ else
+ SHLIB_CFLAGS="-Kpic -belf"
+- LDFLAGS="-belf -Wl,-Bexport"
++ LD_FLAGS="-belf -Wl,-Bexport"
+ fi
+ SHLIB_LD="ld -G"
+ SHLIB_LD_LIBS=""
+@@ -6514,7 +6537,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ ;;
+@@ -6525,7 +6548,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+
+@@ -6561,7 +6584,7 @@ EOF
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ if test "$GCC" = "yes" ; then
+ SHLIB_LD="$CC -shared"
+ CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
+@@ -6587,7 +6610,7 @@ EOF
+
+
+ SHLIB_CFLAGS="-KPIC"
+- LDFLAGS=""
++ LD_FLAGS=""
+
+ # Check to enable 64-bit flags for compiler/linker
+ if test "$do64bit" = "yes" ; then
+@@ -6599,10 +6622,10 @@ EOF
+ do64bit_ok=yes
+ if test "$do64bitVIS" = "yes" ; then
+ EXTRA_CFLAGS="-xarch=v9a"
+- LDFLAGS="-xarch=v9a"
++ LD_FLAGS="-xarch=v9a"
+ else
+ EXTRA_CFLAGS="-xarch=v9"
+- LDFLAGS="-xarch=v9"
++ LD_FLAGS="-xarch=v9"
+ fi
+ fi
+ else
@@ -6626,6 +6649,9 @@ EOF
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
@@ -114,6 +456,36 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
+@@ -6634,7 +6660,7 @@ EOF
+ SHLIB_LD_LIBS='${LIBS}'
+ DL_OBJS="tclLoadAout.o"
+ DL_LIBS=""
+- LDFLAGS="-Wl,-D,08000000"
++ LD_FLAGS="-Wl,-D,08000000"
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ if test "$GCC" != "yes" ; then
+@@ -6675,9 +6701,9 @@ rm -f conftest*
+ LDFLAGS=$hold_ldflags
+ echo "$ac_t""$found" 1>&6
+ if test $found = yes; then
+- LDFLAGS="-Wl,-Bexport"
++ LD_FLAGS="-Wl,-Bexport"
+ else
+- LDFLAGS=""
++ LD_FLAGS=""
+ fi
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+@@ -6852,7 +6878,7 @@ fi
+ SHLIB_SUFFIX=""
+ DL_OBJS="tclLoadNone.o"
+ DL_LIBS=""
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS=""
+ LD_SEARCH_FLAGS=""
+ BUILD_DLTEST=""
@@ -6897,8 +6923,8 @@ fi
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
@@ -171,3 +543,11 @@ $NetBSD: patch-ab,v 1.23 2004/03/08 22:14:19 minskim Exp $
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
+@@ -7487,6 +7519,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+ s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
+ s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g
+ s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g
++s%@LD_FLAGS@%$LD_FLAGS%g
+ s%@STLIB_LD@%$STLIB_LD%g
+ s%@SHLIB_LD@%$SHLIB_LD%g
+ s%@TCL_SHLIB_LD_EXTRAS@%$TCL_SHLIB_LD_EXTRAS%g