diff options
| author | jwise <jwise> | 2004-03-24 15:24:36 +0000 |
|---|---|---|
| committer | jwise <jwise> | 2004-03-24 15:24:36 +0000 |
| commit | 4c55cda1aa586f0ed9082d89c867759933d2cf4b (patch) | |
| tree | 15a1d3edc1bb24b53b1e6e73c0c6f854158901fa /lang | |
| parent | c577b72ea463e6329257b6c3aa042aefca1a0dde (diff) | |
| download | pkgsrc-4c55cda1aa586f0ed9082d89c867759933d2cf4b.tar.gz | |
Now that we build tcl/tk with thread safety enabled, pull pthread buildlink
glue into the tcl buildlink glue.
Also, update buildlink dependencies appropriately.
Pointed out by wiz@netbsd.org.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/tcl/Makefile | 3 | ||||
| -rw-r--r-- | lang/tcl/buildlink2.mk | 6 | ||||
| -rw-r--r-- | lang/tcl/buildlink3.mk | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile index 4471d31364e..9e359320c26 100644 --- a/lang/tcl/Makefile +++ b/lang/tcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/03/22 16:14:02 jwise Exp $ +# $NetBSD: Makefile,v 1.29 2004/03/24 15:24:36 jwise Exp $ # DISTNAME= tcl8.4.6-src @@ -96,4 +96,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/../generic/tclPort.h ${PREFIX}/include/tcl/generic ${INSTALL_DATA} ${WRKSRC}/../generic/tclRegexp.h ${PREFIX}/include/tcl/generic +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tcl/buildlink2.mk b/lang/tcl/buildlink2.mk index 6b3ce9a6173..b25a11046de 100644 --- a/lang/tcl/buildlink2.mk +++ b/lang/tcl/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/03/08 19:55:35 minskim Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/03/24 15:24:36 jwise Exp $ .if !defined(TCL_BUILDLINK2_MK) TCL_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= tcl -BUILDLINK_DEPENDS.tcl?= tcl>=8.4.5 +BUILDLINK_DEPENDS.tcl?= tcl>=8.4.6nb1 BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl EVAL_PREFIX+= BUILDLINK_PREFIX.tcl=tcl @@ -28,4 +28,6 @@ tcl-buildlink: _BUILDLINK_USE TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh +.include "../../mk/pthread.buildlink2.mk" + .endif # TCL_BUILDLINK2_MK diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk index 341ff7cee3b..ba4a04b8228 100644 --- a/lang/tcl/buildlink3.mk +++ b/lang/tcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/03/08 19:55:35 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/03/24 15:24:36 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.5 +BUILDLINK_DEPENDS.tcl+= tcl>=8.4.6nb1 BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl BUILDLINK_FILES.tcl= bin/tclsh* @@ -26,3 +26,5 @@ TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh .endif # TCL_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} + +.include "../../mk/pthread.buildlink3.mk" |