From 2d1ba244e90207d03eef397a99aa4091baeec5b3 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 20 Mar 2009 19:23:50 +0000 Subject: 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. --- lang/tcl-expect/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'lang/tcl-expect') diff --git a/lang/tcl-expect/buildlink3.mk b/lang/tcl-expect/buildlink3.mk index e81a6e5763c..055a643f845 100644 --- a/lang/tcl-expect/buildlink3.mk +++ b/lang/tcl-expect/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:53 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TCL_EXPECT_BUILDLINK3_MK:= ${TCL_EXPECT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tcl-expect -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tcl-expect -.endif +.if !defined(TCL_EXPECT_BUILDLINK3_MK) +TCL_EXPECT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntcl-expect} -BUILDLINK_PACKAGES+= tcl-expect -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tcl-expect - -.if !empty(TCL_EXPECT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb1 BUILDLINK_ABI_DEPENDS.tcl-expect+= tcl-expect>=5.38.0nb2 BUILDLINK_PKGSRCDIR.tcl-expect?= ../../lang/tcl-expect -.endif # TCL_EXPECT_BUILDLINK3_MK .include "../../lang/tcl/buildlink3.mk" +.endif # TCL_EXPECT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tcl-expect -- cgit v1.2.3