diff options
| author | drochner <drochner> | 2004-06-15 16:17:48 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2004-06-15 16:17:48 +0000 |
| commit | 5ca9d30986a626a56cd213bd230dc1bf86ac27e3 (patch) | |
| tree | 574db6fc97ef9679b76108b4ef37a1f704b6b778 /lang | |
| parent | d324ee5724ba1d77120223f80ce2d93b58da0278 (diff) | |
| download | pkgsrc-5ca9d30986a626a56cd213bd230dc1bf86ac27e3.tar.gz | |
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 (limited to 'lang')
| -rw-r--r-- | lang/tcl/Makefile | 11 | ||||
| -rw-r--r-- | lang/tcl/buildlink3.mk | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 90f25cc87f0..aaa76838568 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -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_TARGET= install # 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+= TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl" 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 --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index 00c2b2920af..df6042eae92 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -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:= ${BUILDLINK_PACKAGES:Ntcl} 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 @@ TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh .endif # TCL_BUILDLINK3_MK -.include "../../mk/pthread.buildlink3.mk" +# see comment in Makefile +#.include "../../mk/pthread.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |