diff options
Diffstat (limited to 'lang/tcl/patches/patch-ab')
-rw-r--r-- | lang/tcl/patches/patch-ab | 68 |
1 files changed, 36 insertions, 32 deletions
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index 0ffd294842b..56797b03a9a 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ +$NetBSD: patch-ab,v 1.15 2003/03/16 18:36:24 jschauma Exp $ ---- configure.orig Sat Oct 20 02:24:15 2001 -+++ configure +--- configure.orig Fri Oct 19 20:24:15 2001 ++++ configure Sun Mar 16 13:17:49 2003 @@ -4776,6 +4776,7 @@ # Step 3: set configuration options based on system name and version. @@ -100,7 +100,13 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -5169,17 +5170,17 @@ +@@ -5166,20 +5167,23 @@ + DL_LIBS="-ldl" + LDFLAGS="-rdynamic" + 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 else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 @@ -121,7 +127,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5236,17 +5237,17 @@ +@@ -5236,17 +5240,17 @@ else ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dld.h""... $ac_c" 1>&6 @@ -142,7 +148,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5298,20 +5299,23 @@ +@@ -5298,20 +5302,23 @@ LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) @@ -169,7 +175,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5330,17 +5334,15 @@ +@@ -5330,17 +5337,15 @@ # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -189,13 +195,12 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ #include "confdefs.h" #ifdef __ELF__ -@@ -5351,11 +5353,20 @@ +@@ -5351,11 +5356,20 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* -- echo "$ac_t""yes" 1>&6 + -+ echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 + SHLIB_LD='${TCL_CC} -shared -Wl,-x' + LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}' + TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib" @@ -203,16 +208,15 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ + else rm -rf conftest* -- echo "$ac_t""no" 1>&6 + -+ echo "$ac_t""no" 1>&6 + echo "$ac_t""no" 1>&6 + SHLIB_LD="ld -Bshareable -x" + LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}' + TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib" SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -5569,6 +5580,9 @@ +@@ -5569,6 +5583,9 @@ DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -222,7 +226,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ;; SunOS-5*) -@@ -5616,6 +5630,9 @@ +@@ -5616,6 +5633,9 @@ else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -232,7 +236,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -5641,17 +5658,17 @@ +@@ -5641,17 +5661,17 @@ # that don't grok the -Bexport option. Test that it does. hold_ldflags=$LDFLAGS echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6 @@ -253,7 +257,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ rm -rf conftest* found=yes else -@@ -5697,9 +5714,9 @@ +@@ -5697,9 +5717,9 @@ if test "x$DL_OBJS" = "xtclLoadAout.o" ; then echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6 @@ -265,7 +269,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ #include "confdefs.h" #include <sys/exec.h> int main() { -@@ -5717,7 +5734,7 @@ +@@ -5717,7 +5737,7 @@ ; return 0; } EOF @@ -274,7 +278,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ rm -rf conftest* tcl_ok=usable else -@@ -5735,9 +5752,9 @@ +@@ -5735,9 +5755,9 @@ else echo $ac_n "checking a.out.h""... $ac_c" 1>&6 @@ -286,7 +290,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ #include "confdefs.h" #include <a.out.h> int main() { -@@ -5755,7 +5772,7 @@ +@@ -5755,7 +5775,7 @@ ; return 0; } EOF @@ -295,7 +299,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ rm -rf conftest* tcl_ok=usable else -@@ -5773,9 +5790,9 @@ +@@ -5773,9 +5793,9 @@ else echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6 @@ -307,7 +311,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ #include "confdefs.h" #include <sys/exec_aout.h> int main() { -@@ -5793,7 +5810,7 @@ +@@ -5793,7 +5813,7 @@ ; return 0; } EOF @@ -316,7 +320,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ rm -rf conftest* tcl_ok=usable else -@@ -5890,7 +5907,7 @@ +@@ -5890,7 +5910,7 @@ echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 @@ -325,7 +329,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" -@@ -5927,17 +5944,17 @@ +@@ -5927,17 +5947,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -346,7 +350,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -5967,17 +5984,17 @@ +@@ -5967,17 +5987,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -367,7 +371,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* -@@ -6004,7 +6021,7 @@ +@@ -6004,7 +6024,7 @@ done echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6 @@ -376,7 +380,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ if test -f /usr/lib/NextStep/software_version; then system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version` else -@@ -6066,7 +6083,7 @@ +@@ -6066,7 +6086,7 @@ echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 @@ -385,7 +389,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" -@@ -6103,7 +6120,7 @@ +@@ -6103,7 +6123,7 @@ if test "x$DL_OBJS" = "xtclLoadAout.o"; then MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}" else @@ -394,7 +398,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ fi else case $system in -@@ -6141,7 +6158,7 @@ +@@ -6141,7 +6161,7 @@ TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" @@ -403,7 +407,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -6171,9 +6188,9 @@ +@@ -6171,9 +6191,9 @@ #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then @@ -415,7 +419,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ fi #-------------------------------------------------------------------- -@@ -6186,7 +6203,7 @@ +@@ -6186,7 +6206,7 @@ # Replace DBGX with TCL_DBGX eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" @@ -424,7 +428,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" -@@ -6262,6 +6279,8 @@ +@@ -6262,6 +6282,8 @@ @@ -433,7 +437,7 @@ $NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $ trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure -@@ -6437,12 +6456,12 @@ +@@ -6437,12 +6459,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 |