[pkgsrc/trunk]: pkgsrc Don't --enable-threads for now. If we do this, all pot...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/73db7c645c60
branches:  trunk
changeset: 476613:73db7c645c60
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Tue Jun 15 16:17:48 2004 +0000

description:
Don't --enable-threads for now. If we do this, all potential users of
libtcl.so/libtk.so (whether linking it in or dlopen() it) must be linked
against libpthread. This is something we can't guarantee.
Fixes bulk build error in py-imagingtk and numerous runtime problems.

diffstat:

 lang/tcl/Makefile      |  11 +++++++----
 lang/tcl/buildlink3.mk |   7 ++++---
 x11/tk/Makefile        |   7 ++++---
 x11/tk/buildlink3.mk   |   4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diffs (105 lines):

diff -r d07960e784a9 -r 73db7c645c60 lang/tcl/Makefile
--- a/lang/tcl/Makefile Tue Jun 15 14:27:38 2004 +0000
+++ b/lang/tcl/Makefile Tue Jun 15 16:17:48 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2004/05/12 23:50:15 minskim Exp $
+# $NetBSD: Makefile,v 1.33 2004/06/15 16:17:48 drochner Exp $
 #
 
 DISTNAME=              tcl8.4.6-src
 PKGNAME=               tcl-8.4.6
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            lang
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -29,7 +29,9 @@
 # install to avoid overwriting existing manpages in ${PREFIX}/man.
 #
 CONFIGURE_ARGS+=       --mandir=${WRKDIR}/man
-CONFIGURE_ARGS+=       --enable-threads
+# can't enable threads until all potential users of libtcl.so
+#  link in libpthreads
+#CONFIGURE_ARGS+=      --enable-threads
 
 # Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
 CONFIGURE_ENV+=                TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
@@ -43,7 +45,8 @@
 CONFIGURE_ENV+=                COMPILER_OPTIMIZATION_BUG=YES
 .endif
 
-.include "../../mk/pthread.buildlink3.mk"
+# see above
+#.include "../../mk/pthread.buildlink3.mk"
 
 # Modify mkLinks script to remove the short-filename manpage if it was
 # linked to a longer filename.
diff -r d07960e784a9 -r 73db7c645c60 lang/tcl/buildlink3.mk
--- a/lang/tcl/buildlink3.mk    Tue Jun 15 14:27:38 2004 +0000
+++ b/lang/tcl/buildlink3.mk    Tue Jun 15 16:17:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/04/09 23:37:28 danw Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/06/15 16:17:48 drochner Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TCL_BUILDLINK3_MK:=    ${TCL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tcl+=                tcl>=8.4.6nb1
+BUILDLINK_DEPENDS.tcl+=                tcl>=8.4.6nb5
 BUILDLINK_PKGSRCDIR.tcl?=      ../../lang/tcl
 
 BUILDLINK_FILES.tcl=   bin/tclsh*
@@ -26,6 +26,7 @@
 
 .endif # TCL_BUILDLINK3_MK
 
-.include "../../mk/pthread.buildlink3.mk"
+# see comment in Makefile
+#.include "../../mk/pthread.buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r d07960e784a9 -r 73db7c645c60 x11/tk/Makefile
--- a/x11/tk/Makefile   Tue Jun 15 14:27:38 2004 +0000
+++ b/x11/tk/Makefile   Tue Jun 15 16:17:48 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2004/04/09 23:39:00 danw Exp $
+# $NetBSD: Makefile,v 1.34 2004/06/15 16:17:48 drochner Exp $
 
 DISTNAME=      tk8.4.6-src
 PKGNAME=       tk-8.4.6
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=tcl/}
 
@@ -15,7 +15,8 @@
 WRKSRC=                        ${WRKDIR}/${DISTNAME:C/-src//}/unix
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=       --enable-threads
+# see comment in lang/tcl/Makefile
+#CONFIGURE_ARGS+=      --enable-threads
 MAKE_ENV+=             TOUCH="${TOUCH}"
 
 USE_X11=               yes
diff -r d07960e784a9 -r 73db7c645c60 x11/tk/buildlink3.mk
--- a/x11/tk/buildlink3.mk      Tue Jun 15 14:27:38 2004 +0000
+++ b/x11/tk/buildlink3.mk      Tue Jun 15 16:17:48 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/04/09 23:39:00 danw Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/06/15 16:17:48 drochner Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=     ${TK_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
 BUILDLINK_PACKAGES+=   tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.tk+=         tk>=8.4.6nb1
+BUILDLINK_DEPENDS.tk+=         tk>=8.4.6nb4
 BUILDLINK_PKGSRCDIR.tk?=       ../../x11/tk
 
 BUILDLINK_FILES.tk=    bin/wish*