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/celt/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'audio/celt') diff --git a/audio/celt/buildlink3.mk b/audio/celt/buildlink3.mk index bd610c5d6ba..42fb3679a00 100644 --- a/audio/celt/buildlink3.mk +++ b/audio/celt/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/03 00:44:49 bjs Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:23:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CELT_BUILDLINK3_MK:= ${CELT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= celt -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= celt -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncelt} -BUILDLINK_PACKAGES+= celt -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}celt +.if !defined(CELT_BUILDLINK3_MK) +CELT_BUILDLINK3_MK:= -.if ${CELT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.celt+= celt>=0.5.0 BUILDLINK_PKGSRCDIR.celt?= ../../audio/celt pkgbase:= celt . include "../../mk/pkg-build-options.mk" -.endif # CELT_BUILDLINK3_MK .if !empty(PKG_BUILD_OPTIONS.celt:Mogg) . include "../../multimedia/libogg/buildlink3.mk" .endif +.endif # CELT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -celt -- cgit v1.2.3