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/solaris-tap/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'net/solaris-tap') diff --git a/net/solaris-tap/buildlink3.mk b/net/solaris-tap/buildlink3.mk index e89bd66f03e..03438132861 100644 --- a/net/solaris-tap/buildlink3.mk +++ b/net/solaris-tap/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/07/01 00:43:20 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SOLARIS_TAP_BUILDLINK3_MK:= ${SOLARIS_TAP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= solaris-tap -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= solaris-tap -.endif +.if !defined(SOLARIS_TAP_BUILDLINK3_MK) +SOLARIS_TAP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsolaris-tap} -BUILDLINK_PACKAGES+= solaris-tap -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}solaris-tap - -.if ${SOLARIS_TAP_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.solaris-tap+= solaris-tap>=20070525 BUILDLINK_PKGSRCDIR.solaris-tap?= ../../net/solaris-tap BUILDLINK_DEPMETHOD.solaris-tap?= build -.endif # SOLARIS_TAP_BUILDLINK3_MK +.endif # SOLARIS_TAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -solaris-tap -- cgit v1.2.3