diff options
Diffstat (limited to 'lang/tcl/patches/patch-ab')
| -rw-r--r-- | lang/tcl/patches/patch-ab | 60 |
1 files changed, 45 insertions, 15 deletions
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index 05be65aa30c..bbef1d9c05c 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ +$NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ ---- configure.orig Fri Oct 19 17:24:15 2001 -+++ configure -@@ -4776,6 +4776,7 @@ fi +--- configure.orig 2001-10-19 20:24:15.000000000 -0400 ++++ configure 2004-01-21 14:20:41.000000000 -0500 +@@ -4776,6 +4776,7 @@ # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +10,37 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -5298,6 +5299,9 @@ fi +@@ -5114,6 +5115,9 @@ + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + EXTRA_CFLAGS="" + LDFLAGS="" ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + IRIX-6.*|IRIX64-6.5*) + SHLIB_CFLAGS="" +@@ -5138,6 +5142,9 @@ + esac + LDFLAGS="-n32" + fi ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + IRIX64-6.*) + SHLIB_CFLAGS="" +@@ -5148,6 +5155,9 @@ + DL_LIBS="" + LDFLAGS="" + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + Linux*) + SHLIB_CFLAGS="-fPIC" +@@ -5298,6 +5308,9 @@ LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) @@ -20,7 +50,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ # Not available on all versions: check for include file. ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -@@ -5330,17 +5334,15 @@ if eval "test \"`echo '$ac_cv_header_'$a +@@ -5330,17 +5343,15 @@ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -40,7 +70,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ #include "confdefs.h" #ifdef __ELF__ -@@ -5351,11 +5353,20 @@ EOF +@@ -5351,11 +5362,20 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* @@ -63,7 +93,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -5569,6 +5580,9 @@ EOF +@@ -5569,6 +5589,9 @@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -73,7 +103,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ ;; SunOS-5*) -@@ -5616,6 +5630,9 @@ EOF +@@ -5616,6 +5639,9 @@ else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -83,7 +113,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -6103,7 +6120,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH +@@ -6103,7 +6129,7 @@ if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}" else @@ -92,7 +122,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ fi else case $system in -@@ -6141,7 +6158,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE +@@ -6141,7 +6167,7 @@ TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -101,7 +131,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -6171,10 +6188,17 @@ VERSION=${TCL_VERSION} +@@ -6171,10 +6197,17 @@ #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then @@ -121,7 +151,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ #-------------------------------------------------------------------- # The statements below define various symbols relating to Tcl -@@ -6186,7 +6210,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_ +@@ -6186,7 +6219,7 @@ # Replace DBGX with TCL_DBGX eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" @@ -130,7 +160,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" -@@ -6262,6 +6286,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD} +@@ -6262,6 +6295,8 @@ @@ -139,7 +169,7 @@ $NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $ trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure -@@ -6437,12 +6463,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g +@@ -6437,12 +6472,12 @@ s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g |