pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/libtcl-nothread add a non-threaded libtcl.so, for...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d3e31ac0ae7c
branches: trunk
changeset: 476907:d3e31ac0ae7c
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Jun 22 18:38:46 2004 +0000
description:
add a non-threaded libtcl.so, for embedding into non-threaded applications
diffstat:
lang/libtcl-nothread/DESCR | 8 +
lang/libtcl-nothread/Makefile | 47 +++
lang/libtcl-nothread/PLIST | 7 +
lang/libtcl-nothread/buildlink3.mk | 33 ++
lang/libtcl-nothread/distinfo | 11 +
lang/libtcl-nothread/patches/patch-aa | 113 +++++++
lang/libtcl-nothread/patches/patch-ab | 525 ++++++++++++++++++++++++++++++++++
lang/libtcl-nothread/patches/patch-ac | 45 ++
lang/libtcl-nothread/patches/patch-ae | 37 ++
lang/libtcl-nothread/patches/patch-af | 518 +++++++++++++++++++++++++++++++++
lang/libtcl-nothread/patches/patch-ag | 13 +
lang/libtcl-nothread/patches/patch-ah | 19 +
12 files changed, 1376 insertions(+), 0 deletions(-)
diffs (truncated from 1424 to 300 lines):
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/DESCR Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,8 @@
+This package contains Tcl, John Osterhout's Tool Command Language, an
+exceedingly simple language great for general scripting and for
+embedding in other programs.
+
+The best way to get started with Tcl is to read ``Tcl and the Tk
+Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X
+or ``Practical Programming in Tcl and Tk'' by Brent B. Welch,
+Prentice Hall PTR, ISBN 0-13-616830-X.
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/Makefile Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+#
+
+DISTNAME= tcl8.4.6-src
+PKGNAME= libtcl-nothread-8.4.6
+CATEGORIES= lang
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
+
+MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://www.tcl.tk/
+COMMENT= TCL library for embedding
+
+DEPENDS+= tcl>=8.4.6nb5:../../lang/tcl
+
+WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix
+GNU_CONFIGURE= yes
+MAKE_ENV+= TOUCH="${TOUCH}"
+MAKE_ENV+= NOTHREAD_SUFX=-nothread
+
+USE_BUILDLINK3= yes
+USE_LIBTOOL= yes
+
+TCLLIB= libtcl84-nothread.la
+ALL_TARGET= ${TCLLIB}
+
+# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
+CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
+
+.include "../../mk/bsd.prefs.mk"
+
+# NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
+# tickled by the Tcl code that manifests in code generation problems.
+#
+.if (${MACHINE_PLATFORM:MNetBSD-1.5*-m68k} != "")
+CONFIGURE_ENV+= COMPILER_OPTIMIZATION_BUG=YES
+.endif
+
+post-configure:
+ ${SED} 's|tcl84|tcl84-nothread|g' <${WRKSRC}/tclConfig.sh \
+ >${WRKSRC}/tclConfig-nothread.sh
+
+do-install:
+ cd ${WRKSRC} && \
+ ${LIBTOOL} --mode=install ${INSTALL_DATA} ${TCLLIB} ${PREFIX}/lib; \
+ ${INSTALL_DATA} tclConfig-nothread.sh ${PREFIX}/lib
+
+.include "../../mk/bsd.pkg.mk"
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/PLIST Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+lib/libtcl84-nothread.a
+lib/libtcl84-nothread.la
+lib/libtcl84-nothread.so
+lib/libtcl84-nothread.so.1
+lib/libtcl84-nothread.so.1.0
+lib/tclConfig-nothread.sh
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/buildlink3.mk Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+TCLNT_BUILDLINK3_MK:= ${TCLNT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= tclnt
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntclnt}
+BUILDLINK_PACKAGES+= tclnt
+
+.if !empty(TCLNT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tclnt+= libtcl-nothread>=8.4.6
+BUILDLINK_PKGSRCDIR.tclnt?= ../../lang/libtcl-nothread
+
+BUILDLINK_FILES.tcl= bin/tclsh*
+#
+# Make "-ltcl" and "-ltcl8.4" resolve into "-ltcl84", so that we don't
+# need to patch so many Makefiles.
+#
+BUILDLINK_TRANSFORM+= l:tcl:tcl84-nothread
+BUILDLINK_TRANSFORM+= l:tcl8.4:tcl84-nothread
+
+TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig-nothread.sh
+BUILD_ENV+= _TCL_NOTHREAD=yes
+
+.endif # TCLNT_BUILDLINK3_MK
+
+_TCL_NOTHREAD= yes
+.include "../../lang/tcl/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/distinfo Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/06/22 18:38:46 drochner Exp $
+
+SHA1 (tcl8.4.6-src.tar.gz) = d21495ca04419fc3b1594b96b19116040c33a3f0
+Size (tcl8.4.6-src.tar.gz) = 3448711 bytes
+SHA1 (patch-aa) = 39a4b3649c840ad1ccdce34fc8c3b4f3e38c3e06
+SHA1 (patch-ab) = 7b5dc8c937fedf43042a558f7afdec2a93ba3a62
+SHA1 (patch-ac) = efc40f45f73cec2770231ff515314fc41bbd166e
+SHA1 (patch-ae) = 9a6f9b47c926f851a799ece713668f0955344ce3
+SHA1 (patch-af) = 164fa9ee7fe4baa9b3f3a13716aefbf415e3be0a
+SHA1 (patch-ag) = d1b038f6006ef3611fec9d8cef314f8959a5cd08
+SHA1 (patch-ah) = 0aaa349fcf9ce736e1f7d3dad377ee355f549ecb
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/patches/patch-aa Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,113 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- Makefile.in.orig 2004-03-02 00:58:59.000000000 +0100
++++ Makefile.in
+@@ -76,7 +76,7 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/ma
+ TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+
+ # Libraries built with optimization switches have this additional extension
+-TCL_DBGX = @TCL_DBGX@
++TCL_DBGX = ${NOTHREAD_SUFX}
+
+ # warning flags
+ CFLAGS_WARNING = @CFLAGS_WARNING@
+@@ -95,7 +95,7 @@ CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DT
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
+ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
+-LDFLAGS = @LDFLAGS@ @LDFLAGS_DEFAULT@
++LDFLAGS = @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
+
+ # To disable ANSI-C procedure prototypes reverse the comment characters
+ # on the following lines:
+@@ -172,8 +172,8 @@ SHELL = /bin/sh
+ INSTALL_STRIP_PROGRAM = -s
+ INSTALL_STRIP_LIBRARY = -S -S
+
+-INSTALL = @srcdir@/install-sh -c
+-INSTALL_PROGRAM = ${INSTALL}
++INSTALL := ${LIBTOOL} --mode=install @srcdir@/install-sh -c
++INSTALL_PROGRAM = ${INSTALL} -s
+ INSTALL_LIBRARY = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+
+@@ -191,7 +191,7 @@ TCL_EXE = tclsh
+ # these definitions by hand.
+
+ STLIB_LD = @STLIB_LD@
+-SHLIB_LD = @SHLIB_LD@
++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@
+@@ -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
+
+-CC = @CC@
+ #CC = purify -best-effort @CC@ -DPURIFY
++CC = ${LIBTOOL} --mode=compile @CC@
++LD = ${LIBTOOL} --mode=link @CC@
+
+ # Flags to be passed to mkLinks to control whether the manpages
+ # should be compressed and linked with softlinks
+@@ -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:
+
+ # 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
+@@ -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:
+- ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
++ ${LD} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+ ${CC_SEARCH_FLAGS} -o tcltest
+
+ # Note, in the target below TCL_LIBRARY needs to be set or else
+@@ -1054,7 +1056,7 @@ tclMacOSXBundle.o: $(MAC_OSX_DIR)/tclMac
+
+ xttest: ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
+ @DL_OBJS@ ${BUILD_DLTEST}
+- ${CC} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
++ ${LD} ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
+ @DL_OBJS@ @TCL_BUILD_LIB_SPEC@ ${LIBS} \
+ ${CC_SEARCH_FLAGS} -L/usr/openwin/lib -lXt -o xttest
+
diff -r 63be9bb38e15 -r d3e31ac0ae7c lang/libtcl-nothread/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/libtcl-nothread/patches/patch-ab Tue Jun 22 18:38:46 2004 +0000
@@ -0,0 +1,525 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/06/22 18:38:47 drochner Exp $
+
+--- configure.orig Mon Mar 1 18:58:59 2004
++++ configure
+@@ -5613,12 +5613,13 @@ fi
+ # Step 3: set configuration options based on system name and version.
+
+ do64bit_ok=no
++ TCL_LIB_SPEC_RPATH=""
+ 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"
+
+ DL_OBJS="tclLoadDl.o"
+- LDFLAGS=""
++ LD_FLAGS=""
+
+ LD_LIBRARY_PATH_VAR="LIBPATH"
+
+@@ -5693,7 +5694,7 @@ fi
+ else
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+- LDFLAGS="-q64"
++ LD_FLAGS="-q64"
+ RANLIB="${RANLIB} -X64"
+ AR="${AR} -X64"
+ SHLIB_LD_FLAGS="-b64"
+@@ -5734,7 +5735,7 @@ fi
+ SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+- LDFLAGS=""
++ LD_FLAGS=""
+ CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ LD_LIBRARY_PATH_VAR="LIBPATH"
+@@ -5754,7 +5755,7 @@ fi
+ else
+ do64bit_ok=yes
+ EXTRA_CFLAGS="-q64"
+- LDFLAGS="-q64"
++ LD_FLAGS="-q64"
+ RANLIB="${RANLIB} -X64"
Home |
Main Index |
Thread Index |
Old Index