summaryrefslogtreecommitdiff
path: root/lang/tcl
diff options
context:
space:
mode:
authorjwise <jwise>2004-06-15 16:39:12 +0000
committerjwise <jwise>2004-06-15 16:39:12 +0000
commitb8b6934fcd23293128701aa34dea5e6ae31b45c7 (patch)
tree428454d071885a7f691558db1a7a91aaf49edc57 /lang/tcl
parenta0687ae551ab2b2d2eef5736c1c1ea24f7eb2dd3 (diff)
downloadpkgsrc-b8b6934fcd23293128701aa34dea5e6ae31b45c7.tar.gz
Reverse previous commit (disabling thread-safety), which was poorly though
through, unacceptably breaks threaded apps, and was made without consulting the package's maintainer. To quote my mail to packages@: I am reversing this change. With this change, tcl is _not_ usable in threaded apps, while without this change, tcl is perfectly usable in non-threaded apps. The fix for a package which is incorrectly written is not to break the package it depends on, but do your job correctly when writing the package. With buildlink3, this is mind-numbingly easy to do. That you neither contacted the maintainer of this package, nor did the buildlink and dependent package changes which your change requires shows that you have not really thought this through. So, as I said, I am reversing this change. Fix your own package, don't break others.
Diffstat (limited to 'lang/tcl')
-rw-r--r--lang/tcl/Makefile11
-rw-r--r--lang/tcl/buildlink3.mk7
2 files changed, 7 insertions, 11 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index aaa76838568..5ca73ef6484 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2004/06/15 16:39:12 jwise Exp $
#
DISTNAME= tcl8.4.6-src
PKGNAME= tcl-8.4.6
-PKGREVISION= 5
+PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tcl/}
@@ -29,9 +29,7 @@ INSTALL_TARGET= install
# install to avoid overwriting existing manpages in ${PREFIX}/man.
#
CONFIGURE_ARGS+= --mandir=${WRKDIR}/man
-# can't enable threads until all potential users of libtcl.so
-# link in libpthreads
-#CONFIGURE_ARGS+= --enable-threads
+CONFIGURE_ARGS+= --enable-threads
# Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
@@ -45,8 +43,7 @@ CONFIGURE_ENV+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
CONFIGURE_ENV+= COMPILER_OPTIMIZATION_BUG=YES
.endif
-# see above
-#.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
# Modify mkLinks script to remove the short-filename manpage if it was
# linked to a longer filename.
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index df6042eae92..f0bcc275b48 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/06/15 16:39:12 jwise Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl}
BUILDLINK_PACKAGES+= tcl
.if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+= tcl>=8.4.6nb5
+BUILDLINK_DEPENDS.tcl+= tcl>=8.4.6nb1
BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
BUILDLINK_FILES.tcl= bin/tclsh*
@@ -26,7 +26,6 @@ TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
.endif # TCL_BUILDLINK3_MK
-# see comment in Makefile
-#.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}