From 19be17ed7fe85b8cccbabbe48877f3be9951ed87 Mon Sep 17 00:00:00 2001 From: minskim Date: Sat, 7 Feb 2004 05:30:19 +0000 Subject: Use libtcl83* as shared library names on Linux, instead of libtcl8.3*. This closes PR pkg/24194. Approved by uebayasi@. --- lang/tcl/distinfo | 6 +++--- lang/tcl/patches/patch-ab | 50 ++++++++++++++++++++++++++++------------------- lang/tcl/patches/patch-af | 30 ++++++++++++++++++---------- 3 files changed, 53 insertions(+), 33 deletions(-) (limited to 'lang/tcl') diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo index 2319e14d29c..1c2fce0910e 100644 --- a/lang/tcl/distinfo +++ b/lang/tcl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2004/01/21 21:55:41 cube Exp $ +$NetBSD: distinfo,v 1.18 2004/02/07 05:30:19 minskim Exp $ SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec Size (tcl8.3.4.tar.gz) = 2654756 bytes SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce -SHA1 (patch-ab) = 2ca76262ec02ddf6d2c43ebca70bc2807a6d446b +SHA1 (patch-ab) = 0e5a89fdf9623f78f4165c025412428aef5146df SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8 SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774 -SHA1 (patch-af) = 6f603e84c469dc4953edb9947bec6358ab2ffea1 +SHA1 (patch-af) = 6d2b97ea8ad9de7e22ed6c2c81aa91aeadad3241 diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab index bbef1d9c05c..d037a05115b 100644 --- a/lang/tcl/patches/patch-ab +++ b/lang/tcl/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ +$NetBSD: patch-ab,v 1.21 2004/02/07 05:30:19 minskim Exp $ ---- configure.orig 2001-10-19 20:24:15.000000000 -0400 -+++ configure 2004-01-21 14:20:41.000000000 -0500 -@@ -4776,6 +4776,7 @@ +--- configure.orig Fri Oct 19 19:24:15 2001 ++++ configure +@@ -4776,6 +4776,7 @@ fi # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -5114,6 +5115,9 @@ +@@ -5114,6 +5115,9 @@ fi LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ ;; IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" -@@ -5138,6 +5142,9 @@ +@@ -5138,6 +5142,9 @@ fi esac LDFLAGS="-n32" fi @@ -30,7 +30,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -5148,6 +5155,9 @@ +@@ -5148,6 +5155,9 @@ fi DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' @@ -40,7 +40,17 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -5298,6 +5308,9 @@ +@@ -5221,6 +5231,9 @@ fi + EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" + fi + ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + GNU*) + SHLIB_CFLAGS="-fPIC" +@@ -5298,6 +5311,9 @@ fi LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*) @@ -50,7 +60,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise 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 +5343,15 @@ +@@ -5330,17 +5346,15 @@ if eval "test \"`echo '$ac_cv_header_'$a # NetBSD/SPARC needs -fPIC, -fpic will not do. SHLIB_CFLAGS="-fPIC" @@ -63,14 +73,14 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ - LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' echo $ac_n "checking for ELF""... $ac_c" 1>&6 -echo "configure:5342: checking for ELF" >&5 -+echo "configure:5344: checking for ELF" >&5 ++echo "configure:5356: checking for ELF" >&5 cat > conftest.$ac_ext <&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* @@ -93,7 +103,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0' fi -@@ -5569,6 +5589,9 @@ +@@ -5569,6 +5592,9 @@ EOF DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -103,7 +113,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ ;; SunOS-5*) -@@ -5616,6 +5639,9 @@ +@@ -5616,6 +5642,9 @@ EOF else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi @@ -113,7 +123,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ ;; ULTRIX-4.*) SHLIB_CFLAGS="-G 0" -@@ -6103,7 +6129,7 @@ +@@ -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 @@ -122,7 +132,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ fi else case $system in -@@ -6141,7 +6167,7 @@ +@@ -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}" @@ -131,7 +141,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ else TCL_BUILD_EXP_FILE="lib.exp" eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -6171,10 +6197,17 @@ +@@ -6171,10 +6200,17 @@ VERSION=${TCL_VERSION} #-------------------------------------------------------------------- if test "$prefix" != "$exec_prefix"; then @@ -151,7 +161,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ #-------------------------------------------------------------------- # The statements below define various symbols relating to Tcl -@@ -6186,7 +6219,7 @@ +@@ -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}\"" @@ -160,7 +170,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}" -@@ -6262,6 +6295,8 @@ +@@ -6262,6 +6298,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD} @@ -169,7 +179,7 @@ $NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $ trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure -@@ -6437,12 +6472,12 @@ +@@ -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 diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af index 0baf96691a6..32fa842d3bc 100644 --- a/lang/tcl/patches/patch-af +++ b/lang/tcl/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ +$NetBSD: patch-af,v 1.8 2004/02/07 05:30:19 minskim Exp $ ---- tcl.m4.orig 2001-10-19 20:24:15.000000000 -0400 -+++ tcl.m4 2004-01-21 13:57:23.000000000 -0500 -@@ -601,6 +601,7 @@ +--- tcl.m4.orig Fri Oct 19 19:24:15 2001 ++++ tcl.m4 +@@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [ # Step 3: set configuration options based on system name and version. do64bit_ok=no @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ EXTRA_CFLAGS="" TCL_EXPORT_FILE_SUFFIX="" UNSHARED_LIB_SUFFIX="" -@@ -790,6 +791,9 @@ +@@ -790,6 +791,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' EXTRA_CFLAGS="" LDFLAGS="" @@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ ;; IRIX-6.*|IRIX64-6.5*) SHLIB_CFLAGS="" -@@ -814,6 +818,9 @@ +@@ -814,6 +818,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) esac LDFLAGS="-n32" fi @@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ ;; IRIX64-6.*) SHLIB_CFLAGS="" -@@ -824,6 +831,9 @@ +@@ -824,6 +831,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) DL_LIBS="" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' @@ -40,7 +40,17 @@ $NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ ;; Linux*) SHLIB_CFLAGS="-fPIC" -@@ -910,28 +920,36 @@ +@@ -865,6 +875,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) + EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline" + fi + ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' ++ TCL_LIB_VERSIONS_OK=nodots + ;; + GNU*) + SHLIB_CFLAGS="-fPIC" +@@ -910,28 +923,36 @@ dnl AC_CHECK_TOOL(AR, ar, :) LD_SEARCH_FLAGS="" ;; NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*) @@ -82,7 +92,7 @@ $NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ ], [ SHLIB_CFLAGS="" SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r" -@@ -1129,6 +1147,9 @@ +@@ -1129,6 +1150,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) DL_LIBS="-ldl" LDFLAGS="" LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' @@ -92,7 +102,7 @@ $NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $ ;; SunOS-5*) -@@ -1173,6 +1194,9 @@ +@@ -1173,6 +1197,9 @@ dnl AC_CHECK_TOOL(AR, ar, :) else LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' fi -- cgit v1.2.3