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. --- graphics/gegl/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'graphics/gegl') diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk index 03bb5b73334..9bacd23a11d 100644 --- a/graphics/gegl/buildlink3.mk +++ b/graphics/gegl/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/02/03 06:21:40 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:39 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEGL_BUILDLINK3_MK:= ${GEGL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gegl -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gegl -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngegl} -BUILDLINK_PACKAGES+= gegl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gegl +.if !defined(GEGL_BUILDLINK3_MK) +GEGL_BUILDLINK3_MK:= -.if ${GEGL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gegl+= gegl>=0.0.20 BUILDLINK_PKGSRCDIR.gegl?= ../../graphics/gegl -.endif # GEGL_BUILDLINK3_MK pkgbase := gegl .include "../../mk/pkg-build-options.mk" @@ -28,5 +20,6 @@ pkgbase := gegl .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GEGL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gegl -- cgit v1.2.3