diff options
| author | drochner <drochner@pkgsrc.org> | 2004-06-15 16:17:48 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2004-06-15 16:17:48 +0000 |
| commit | 0d9ac4a76543d3299cfe273b6d3517ab96b3dca1 (patch) | |
| tree | 574db6fc97ef9679b76108b4ef37a1f704b6b778 /x11 | |
| parent | 9cf52a3412da16e1b9e68ad594249a9e7e768470 (diff) | |
| download | pkgsrc-0d9ac4a76543d3299cfe273b6d3517ab96b3dca1.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 'x11')
| -rw-r--r-- | x11/tk/Makefile | 7 | ||||
| -rw-r--r-- | x11/tk/buildlink3.mk | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index d1cef50a38a..045ffefecdc 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews 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 --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index 576b580eeac..1d84c448f55 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -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:= ${BUILDLINK_PACKAGES:Ntk} 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* |