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. --- net/bind96/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'net/bind96') diff --git a/net/bind96/buildlink3.mk b/net/bind96/buildlink3.mk index ebd9d6963c6..6539d0e019a 100644 --- a/net/bind96/buildlink3.mk +++ b/net/bind96/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 00:21:36 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BIND_BUILDLINK3_MK:= ${BIND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bind -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= bind -.endif +.if !defined(BIND_BUILDLINK3_MK) +BIND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbind} -BUILDLINK_PACKAGES+= bind -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind - -.if ${BIND_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.bind+= bind>=9.6.0 BUILDLINK_PKGSRCDIR.bind?= ../../net/bind96 -.endif # BIND_BUILDLINK3_MK +.endif # BIND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bind -- cgit v1.2.3