summaryrefslogtreecommitdiff
path: root/lang/tcl
diff options
context:
space:
mode:
authorjoerg <joerg>2009-03-20 19:23:50 +0000
committerjoerg <joerg>2009-03-20 19:23:50 +0000
commit405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /lang/tcl
parentf0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
downloadpkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.tar.gz
Simply and speed up buildlink3.mk files and processing.
This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
Diffstat (limited to 'lang/tcl')
-rw-r--r--lang/tcl/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 4c1be953873..5d68998fd61 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.19 2006/07/08 23:10:56 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:53 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TCL_BUILDLINK3_MK:= ${TCL_BUILDLINK3_MK}+
+BUILDLINK_TREE+= tcl
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= tcl
-.endif
+.if !defined(TCL_BUILDLINK3_MK)
+TCL_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl}
-BUILDLINK_PACKAGES+= tcl
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl
-
-.if !empty(TCL_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.tcl+= tcl>=8.4.6nb1
BUILDLINK_ABI_DEPENDS.tcl+= tcl>=8.4.7nb1
BUILDLINK_PKGSRCDIR.tcl?= ../../lang/tcl
@@ -28,8 +21,8 @@ TCLCONFIG_SH?= ${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
PRINT_PLIST_AWK+= /^@dirrm lib\/tcl$$/ \
{ print "@comment in tcl: " $$0; next; }
-.endif # TCL_BUILDLINK3_MK
.include "../../mk/dlopen.buildlink3.mk"
+.endif # TCL_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -tcl