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. --- sysutils/nautilus-cd-burner/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'sysutils/nautilus-cd-burner') diff --git a/sysutils/nautilus-cd-burner/buildlink3.mk b/sysutils/nautilus-cd-burner/buildlink3.mk index 099b218ce2a..2574d4773d3 100644 --- a/sysutils/nautilus-cd-burner/buildlink3.mk +++ b/sysutils/nautilus-cd-burner/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.17 2008/12/07 15:16:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:25 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -NAUTILUS_CD_BURNER_BUILDLINK3_MK:= ${NAUTILUS_CD_BURNER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= nautilus-cd-burner -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= nautilus-cd-burner -.endif +.if !defined(NAUTILUS_CD_BURNER_BUILDLINK3_MK) +NAUTILUS_CD_BURNER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nnautilus-cd-burner} -BUILDLINK_PACKAGES+= nautilus-cd-burner -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}nautilus-cd-burner - -.if ${NAUTILUS_CD_BURNER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.nautilus-cd-burner+= nautilus-cd-burner>=2.24.0 BUILDLINK_PKGSRCDIR.nautilus-cd-burner?= ../../sysutils/nautilus-cd-burner -.endif # NAUTILUS_CD_BURNER_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/hal/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # NAUTILUS_CD_BURNER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -nautilus-cd-burner -- cgit v1.2.3