summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/tcl/Makefile21
-rw-r--r--lang/tcl/PLIST6
-rw-r--r--lang/tcl/buildlink2.mk7
-rw-r--r--lang/tcl/buildlink3.mk7
-rw-r--r--lang/tcl/distinfo6
-rw-r--r--lang/tcl/patches/patch-aa51
-rw-r--r--lang/tcl/patches/patch-ab142
7 files changed, 114 insertions, 126 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 40a74c0726d..fb34ef6f7ea 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/03/25 22:49:14 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2004/04/09 23:37:28 danw Exp $
#
DISTNAME= tcl8.4.6-src
PKGNAME= tcl-8.4.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -25,8 +25,6 @@ USE_LIBTOOL= yes
INSTALL_TARGET= install
-PLIST_SUBST+= SHLIB_SUFX="${SHLIB_SUFX}"
-
# Initially install the man pages into ${WRKDIR}/man, as we need a staged
# install to avoid overwriting existing manpages in ${PREFIX}/man.
#
@@ -38,14 +36,6 @@ CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+= SHLIB_CMT="@comment "
-SHLIB_SUFX= dylib
-.else
-PLIST_SUBST+= SHLIB_CMT=""
-SHLIB_SUFX= la
-.endif
-
# NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
# tickled by the Tcl code that manifests in code generation problems.
#
@@ -71,13 +61,6 @@ post-patch:
${RM} -f mkLinks.tmp; \
${CHMOD} +x mkLinks;
-pre-install:
- cd ${WRKSRC}; for file in \
- tclUnixInit.o libtcl84.so tclsh; \
- do \
- ${TOUCH} $${file}; \
- done
-
post-install:
cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
${RM} -rf ${WRKDIR}/man
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index e897fb82ce6..4b409b96e03 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/03/08 19:55:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/09 23:37:28 danw Exp $
bin/tclsh
bin/tclsh8.4
include/tcl.h
@@ -17,8 +17,8 @@ include/tcl/generic/tclRegexp.h
include/tcl/unix/tclUnixPort.h
include/tclDecls.h
include/tclPlatDecls.h
-${SHLIB_CMT}lib/libtcl84.a
-lib/libtcl84.${SHLIB_SUFX}
+lib/libtcl84.a
+lib/libtcl84.la
lib/libtcl84.so
lib/libtcl84.so.1
lib/libtcl84.so.1.0
diff --git a/lang/tcl/buildlink2.mk b/lang/tcl/buildlink2.mk
index b25a11046de..a7e3d78fce1 100644
--- a/lang/tcl/buildlink2.mk
+++ b/lang/tcl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/24 15:24:36 jwise Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/04/09 23:37:28 danw Exp $
.if !defined(TCL_BUILDLINK2_MK)
TCL_BUILDLINK2_MK= # defined
@@ -17,10 +17,11 @@ BUILDLINK_FILES.tcl+= include/tcl/*/*.h
BUILDLINK_FILES.tcl+= lib/libtcl84.*
BUILDLINK_FILES.tcl+= lib/libtclstub84.*
-# Make "-ltcl" resolve into "-ltcl84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
+# need to patch so many Makefiles.
#
BUILDLINK_TRANSFORM+= l:tcl:tcl84
+BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84
BUILDLINK_TARGETS+= tcl-buildlink
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index ba5af46c367..00c2b2920af 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/03/25 22:45:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/04/09 23:37:28 danw Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
@@ -16,10 +16,11 @@ BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
BUILDLINK_FILES.tcl= bin/tclsh*
#
-# Make "-ltcl" resolve into "-ltcl84", so that we don't need to patch so
-# many Makefiles.
+# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
+# need to patch so many Makefiles.
#
BUILDLINK_TRANSFORM+= l:tcl:tcl84
+BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84
TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index dca56649e64..574e0ab809f 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2004/03/25 22:49:14 jlam Exp $
+$NetBSD: distinfo,v 1.22 2004/04/09 23:37:28 danw Exp $
SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
-SHA1 (patch-aa) = 5a8d4d6a14c3520cb9f46e65d826ee85f48b2c5b
-SHA1 (patch-ab) = 3032c2b97e69260827f9fec27553557572b9bdb4
+SHA1 (patch-aa) = c23a611dd51dd030f6c77578eb455aa3d63d5c08
+SHA1 (patch-ab) = 7b5dc8c937fedf43042a558f7afdec2a93ba3a62
SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index 5b1ac97e161..26c5128675e 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2004/04/09 23:37:28 danw Exp $
--- Makefile.in.orig Mon Mar 1 18:58:59 2004
+++ Makefile.in
@@ -22,18 +22,24 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
INSTALL_LIBRARY = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-@@ -190,8 +190,8 @@ TCL_EXE = tclsh
- # configure script. You shouldn't normally need to modify any of
+@@ -191,7 +191,7 @@ TCL_EXE = tclsh
# these definitions by hand.
--STLIB_LD = @STLIB_LD@
+ STLIB_LD = @STLIB_LD@
-SHLIB_LD = @SHLIB_LD@
-+STLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
SHLIB_CFLAGS = @SHLIB_CFLAGS@
SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@
SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-@@ -254,8 +254,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest
+@@ -217,6 +217,7 @@ BUILD_DLTEST = @BUILD_DLTEST@
+ #BUILD_DLTEST =
+
+ TCL_LIB_FILE = @TCL_LIB_FILE@
++TCL_LA_FILE = ${TCL_LIB_FILE:C/@SHLIB_SUFFIX@/.la/}
+ #TCL_LIB_FILE = libtcl.a
+
+ # Generic lib name used in rules that apply to tcl and tk
+@@ -254,8 +255,9 @@ DLTEST_DIR = @TCL_SRC_DIR@/unix/dltest
# Must be absolute to so the corresponding tcltest's tcl_library is absolute.
TCL_BUILDTIME_LIBRARY = @TCL_SRC_DIR@/library
@@ -44,16 +50,41 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
# Flags to be passed to mkLinks to control whether the manpages
# should be compressed and linked with softlinks
-@@ -474,7 +475,7 @@ objs: ${OBJS}
+@@ -445,7 +447,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
+
+ all: binaries libraries doc
+
+-binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
++binaries: ${TCL_LA_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh
+
+ libraries:
+@@ -453,7 +455,7 @@ doc:
- tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ # The following target is configured by autoconf to generate either
+ # a shared library or non-shared library for Tcl.
+-${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
++${TCL_LA_FILE}: ${OBJS} ${STUB_LIB_FILE}
+ rm -f $@
+ @MAKE_LIB@
+
+@@ -473,8 +475,8 @@ tclLibObjs:
+ objs: ${OBJS}
+
+
+-tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
- ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++tclsh: ${TCLSH_OBJS} ${TCL_LA_FILE}
+ ${LD} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
${CC_SEARCH_FLAGS} -o tclsh
# Resetting the LIB_RUNTIME_DIR below is required so that
-@@ -486,7 +487,7 @@ tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE}
+@@ -482,11 +484,11 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
+ # burned into its ld search path. This keeps tcltest from
+ # picking up an already installed version of the Tcl library.
+
+-tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST}
++tcltest: ${TCLTEST_OBJS} ${TCL_LA_FILE} ${BUILD_DLTEST}
$(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd`
tcltest-real:
@@ -62,7 +93,7 @@ $NetBSD: patch-aa,v 1.10 2004/03/25 22:49:14 jlam Exp $
${CC_SEARCH_FLAGS} -o tcltest
# Note, in the target below TCL_LIBRARY needs to be set or else
-@@ -1054,7 +1055,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+@@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
@DL_OBJS@ ${BUILD_DLTEST}
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index d2c86a091ed..d860b17c32f 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
+$NetBSD: patch-ab,v 1.25 2004/04/09 23:37:28 danw Exp $
--- configure.orig Mon Mar 1 18:58:59 2004
+++ configure
-@@ -5613,6 +5613,7 @@ fi
+@@ -5613,12 +5613,13 @@ fi
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -10,6 +10,13 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
+ TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
+ ECHO_VERSION='`echo ${VERSION}`'
+- TCL_LIB_VERSIONS_OK=ok
++ TCL_LIB_VERSIONS_OK=nodots
+ CFLAGS_DEBUG=-g
+ CFLAGS_OPTIMIZE=-O
+ if test "$GCC" = "yes" ; then
@@ -5682,7 +5683,7 @@ fi
SHLIB_SUFFIX=".so"
@@ -113,19 +120,16 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -6037,7 +6038,10 @@ fi
+@@ -6037,7 +6038,7 @@ fi
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
EXTRA_CFLAGS=""
- 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=""
-@@ -6050,7 +6054,7 @@ fi
+@@ -6050,7 +6051,7 @@ fi
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
if test "$GCC" = "yes" ; then
EXTRA_CFLAGS="-mabi=n32"
@@ -134,20 +138,16 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
else
case $system in
IRIX-6.3)
-@@ -6061,8 +6065,11 @@ fi
+@@ -6061,7 +6062,7 @@ fi
EXTRA_CFLAGS="-n32"
;;
esac
- LDFLAGS="-n32"
+ LD_FLAGS="-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=""
-@@ -6071,7 +6078,7 @@ fi
+@@ -6071,7 +6072,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -156,7 +156,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-@@ -6084,9 +6091,12 @@ fi
+@@ -6084,7 +6085,7 @@ fi
do64bit_ok=yes
SHLIB_LD="ld -64 -shared -rdata_shared"
EXTRA_CFLAGS="-64"
@@ -164,13 +164,8 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
+ LD_FLAGS="-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"
-@@ -6103,7 +6113,7 @@ fi
+@@ -6103,7 +6104,7 @@ fi
SHLIB_LD="${CC} -shared"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -179,7 +174,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
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
+@@ -6139,7 +6140,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
SHLIB_LD="ld -shared"
DL_OBJS="tclLoadDld.o"
DL_LIBS="-ldld"
@@ -188,17 +183,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
else
-@@ -6168,6 +6178,9 @@ fi
- EOF
-
-
-+ 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"
-@@ -6178,7 +6191,7 @@ EOF
+@@ -6178,7 +6179,7 @@ EOF
SHLIB_LD="${CC} -shared"
DL_OBJS=""
DL_LIBS="-ldl"
@@ -207,7 +192,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
else
-@@ -6214,7 +6227,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -6214,7 +6215,7 @@ if eval "test \"`echo '$ac_cv_header_'$a
SHLIB_LD="ld -shared"
DL_OBJS=""
DL_LIBS="-ldld"
@@ -216,7 +201,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
else
-@@ -6233,7 +6246,7 @@ fi
+@@ -6233,7 +6234,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -225,7 +210,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6244,11 +6257,14 @@ fi
+@@ -6244,11 +6245,14 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -241,7 +226,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 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
-@@ -6281,18 +6297,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -6281,18 +6285,16 @@ if eval "test \"`echo '$ac_cv_header_'$a
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -263,7 +248,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
#include "confdefs.h"
#ifdef __ELF__
-@@ -6303,11 +6317,20 @@ EOF
+@@ -6303,11 +6305,20 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -286,7 +271,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -6323,7 +6346,7 @@ else
+@@ -6323,7 +6334,7 @@ else
SHLIB_SUFFIX=".a"
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -295,7 +280,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
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
+@@ -6344,14 +6355,14 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -312,7 +297,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
fi
case $system in
FreeBSD-3.*)
-@@ -6372,7 +6395,7 @@ fi
+@@ -6372,7 +6383,7 @@ fi
DL_OBJS="tclLoadDyld.o"
PLAT_OBJS="tclMacOSXBundle.o"
DL_LIBS=""
@@ -321,7 +306,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
CFLAGS_OPTIMIZE="-Os"
-@@ -6389,7 +6412,7 @@ fi
+@@ -6389,7 +6400,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadNext.o"
DL_LIBS=""
@@ -330,7 +315,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6409,7 +6432,7 @@ EOF
+@@ -6409,7 +6420,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadOSF.o"
DL_LIBS=""
@@ -339,7 +324,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6425,7 +6448,7 @@ EOF
+@@ -6425,7 +6436,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -348,7 +333,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6441,7 +6464,7 @@ EOF
+@@ -6441,7 +6452,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -357,7 +342,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
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
+@@ -6458,7 +6469,7 @@ EOF
LIBS="$LIBS -lpthread -lmach -lexc"
else
EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
@@ -366,7 +351,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
fi
fi
-@@ -6473,7 +6496,7 @@ EOF
+@@ -6473,7 +6484,7 @@ EOF
DL_OBJS="tclLoadDl.o"
# dlopen is in -lc on QNX
DL_LIBS=""
@@ -375,7 +360,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6484,7 +6507,7 @@ EOF
+@@ -6484,7 +6495,7 @@ EOF
SHLIB_SUFFIX=".a"
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -384,7 +369,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
;;
-@@ -6494,10 +6517,10 @@ EOF
+@@ -6494,10 +6505,10 @@ EOF
# below.
if test "$GCC" = "yes" ; then
SHLIB_CFLAGS="-fPIC -melf"
@@ -397,7 +382,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
fi
SHLIB_LD="ld -G"
SHLIB_LD_LIBS=""
-@@ -6514,7 +6537,7 @@ EOF
+@@ -6514,7 +6525,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -406,7 +391,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6525,7 +6548,7 @@ EOF
+@@ -6525,7 +6536,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -415,7 +400,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-@@ -6561,7 +6584,7 @@ EOF
+@@ -6561,7 +6572,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -424,7 +409,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
if test "$GCC" = "yes" ; then
SHLIB_LD="$CC -shared"
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -6587,7 +6610,7 @@ EOF
+@@ -6587,7 +6598,7 @@ EOF
SHLIB_CFLAGS="-KPIC"
@@ -433,7 +418,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes" ; then
-@@ -6599,10 +6622,10 @@ EOF
+@@ -6599,10 +6610,10 @@ EOF
do64bit_ok=yes
if test "$do64bitVIS" = "yes" ; then
EXTRA_CFLAGS="-xarch=v9a"
@@ -446,17 +431,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
fi
fi
else
-@@ -6626,6 +6649,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'
-+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-+ TCL_LIB_VERSIONS_OK=nodots
- ;;
- ULTRIX-4.*)
- SHLIB_CFLAGS="-G 0"
-@@ -6634,7 +6660,7 @@ EOF
+@@ -6634,7 +6645,7 @@ EOF
SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -465,7 +440,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
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*
+@@ -6675,9 +6686,9 @@ rm -f conftest*
LDFLAGS=$hold_ldflags
echo "$ac_t""$found" 1>&6
if test $found = yes; then
@@ -477,7 +452,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
-@@ -6852,7 +6878,7 @@ fi
+@@ -6852,7 +6863,7 @@ fi
SHLIB_SUFFIX=""
DL_OBJS="tclLoadNone.o"
DL_LIBS=""
@@ -486,31 +461,28 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
BUILD_DLTEST=""
-@@ -6897,8 +6923,8 @@ fi
+@@ -6889,16 +6900,16 @@ fi
+ fi
+
+ if test "$SHARED_LIB_SUFFIX" = "" ; then
+- SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}${SHLIB_SUFFIX}'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}${SHLIB_SUFFIX}'
+ fi
+ if test "$UNSHARED_LIB_SUFFIX" = "" ; then
+- UNSHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ fi
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)'
++ MAKE_LIB='${SHLIB_LD} -o $@ ${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) $(TCL_LA_FILE) $(LIB_INSTALL_DIR)/$(LIB_FILE)'
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -6915,10 +6941,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
-
-@@ -7217,7 +7243,7 @@ elif test "$SHARED_BUILD" = "0" || test
+@@ -7217,7 +7228,7 @@ elif test "$SHARED_BUILD" = "0" || test
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -519,7 +491,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7247,13 +7273,19 @@ VERSION=${TCL_VERSION}
+@@ -7247,13 +7258,19 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
@@ -543,7 +515,7 @@ $NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
-@@ -7487,6 +7519,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+@@ -7487,6 +7504,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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-05 15:25:01 +0000