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. --- audio/sweep/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'audio/sweep') diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk index 87b97587176..18f2aab5db4 100644 --- a/audio/sweep/buildlink3.mk +++ b/audio/sweep/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/11/08 21:13:27 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:23:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SWEEP_BUILDLINK3_MK:= ${SWEEP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sweep -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sweep -.endif +.if !defined(SWEEP_BUILDLINK3_MK) +SWEEP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsweep} -BUILDLINK_PACKAGES+= sweep -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sweep - -.if !empty(SWEEP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.sweep+= sweep>=0.8.2nb6 BUILDLINK_ABI_DEPENDS.sweep+= sweep>=0.9.3nb1 BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep -.endif # SWEEP_BUILDLINK3_MK .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libsamplerate/buildlink3.mk" @@ -25,5 +17,6 @@ BUILDLINK_PKGSRCDIR.sweep?= ../../audio/sweep .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/tdb/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # SWEEP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sweep -- cgit v1.2.3