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-ab144
1 files changed, 44 insertions, 100 deletions
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index d037a05115b..6a736e11796 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
+$NetBSD: patch-ab,v 1.22 2004/03/08 19:55:35 minskim Exp $
---- configure.orig Fri Oct 19 19:24:15 2001
+--- configure.orig 2004-02-07 21:57:29.000000000 -0600
+++ configure
-@@ -4776,6 +4776,7 @@ fi
+@@ -5558,6 +5558,7 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -5114,6 +5115,9 @@ fi
- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5977,6 +5978,9 @@ fi
+ LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
EXTRA_CFLAGS=""
LDFLAGS=""
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
;;
IRIX-6.*|IRIX64-6.5*)
SHLIB_CFLAGS=""
-@@ -5138,6 +5142,9 @@ fi
+@@ -6002,6 +6006,9 @@ fi
esac
LDFLAGS="-n32"
fi
@@ -30,19 +30,19 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -5148,6 +5155,9 @@ fi
- DL_LIBS=""
- LDFLAGS=""
- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -6026,6 +6033,9 @@ fi
+ LDFLAGS="-64"
+ fi
+ fi
+ 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"
-@@ -5221,6 +5231,9 @@ fi
- EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
- fi
+@@ -6107,6 +6117,9 @@ fi
+ EOF
+
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -5298,6 +5311,9 @@ fi
+@@ -6188,6 +6201,9 @@ fi
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -60,7 +60,7 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim 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 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -6220,18 +6236,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -70,17 +70,18 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
-- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 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
--echo "configure:5342: checking for ELF" >&5
-+echo "configure:5356: checking for ELF" >&5
+-echo "configure:6233: checking for ELF" >&5
++echo "configure:6247: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
--#line 5344 "configure"
-+#line 5358 "configure"
+-#line 6235 "configure"
++#line 6249 "configure"
#include "confdefs.h"
#ifdef __ELF__
-@@ -5351,11 +5365,20 @@ EOF
+@@ -6242,11 +6256,20 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -103,18 +104,8 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -5569,6 +5592,9 @@ EOF
- DL_LIBS="-ldl"
- LDFLAGS=""
- LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
-+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+ TCL_LIB_VERSIONS_OK=nodots
- ;;
- SunOS-5*)
-
-@@ -5616,6 +5642,9 @@ EOF
- else
+@@ -6565,6 +6588,9 @@ EOF
+ CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -123,74 +114,27 @@ $NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -6103,7 +6132,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
- if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
- else
-- MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
-+ MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
- fi
- else
- case $system in
-@@ -6141,7 +6170,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE
- TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
- fi
- TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
-- TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
- else
- TCL_BUILD_EXP_FILE="lib.exp"
- eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6200,17 @@ VERSION=${TCL_VERSION}
- #--------------------------------------------------------------------
-
- if test "$prefix" != "$exec_prefix"; then
-- TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-+ TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib"
- else
-- TCL_PACKAGE_PATH="${prefix}/lib"
-+ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
- fi
-+for dir in ${TCL_PACKAGE_PATH_ADD}; do
-+ if test -z "${TCL_PACKAGE_PATH}"; then
-+ TCL_PACKAGE_PATH="$dir"
-+ else
-+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
-+ fi
-+done
+@@ -6836,8 +6862,8 @@ fi
- #--------------------------------------------------------------------
- # The statements below define various symbols relating to Tcl
-@@ -6186,7 +6222,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
- # Replace DBGX with TCL_DBGX
- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
-
--MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
-+MAKE_STUB_LIB="\${STLIB_LD} -o \$@ \${STUB_LIB_OBJS}"
-
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -6262,6 +6298,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
+ if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
+ LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+- MAKE_LIB='${SHLIB_LD} -o $@ ${SHLIB_LD_FLAGS} ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
+- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
++ MAKE_LIB='${SHLIB_LD} -o ${@:C/\.so.*/.la/} ${SHLIB_LD_FLAGS} ${OBJS:.o=.lo} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS} -version-info 1:0'
++ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE:C/\.so.*/.la/) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
+ else
+ LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
+@@ -6854,10 +6880,10 @@ fi
+ # Stub lib does not depend on shared/static configuration
+ if test "$RANLIB" = "" ; then
+- MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
++ MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS}'
+ INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)'
+ else
+- MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
++ MAKE_STUB_LIB='${STLIB_LD} -o $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
+ INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
+ fi
-+
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -6437,12 +6475,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g
- 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
-+s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
-+s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
- s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g
- s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
- s%@DL_OBJS@%$DL_OBJS%g
- s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g
--s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
--s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
- s%@STLIB_LD@%$STLIB_LD%g
- s%@SHLIB_LD@%$SHLIB_LD%g
- s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-06 09:14:56 +0000