From 75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd 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/silgraphite-ft/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'graphics/silgraphite-ft') diff --git a/graphics/silgraphite-ft/buildlink3.mk b/graphics/silgraphite-ft/buildlink3.mk index 7c0d0422315..571a1ce9fd5 100644 --- a/graphics/silgraphite-ft/buildlink3.mk +++ b/graphics/silgraphite-ft/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/13 06:58:01 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:45 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SILGRAPHITE_FT_BUILDLINK3_MK:= ${SILGRAPHITE_FT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= silgraphite-ft -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= silgraphite-ft -.endif +.if !defined(SILGRAPHITE_FT_BUILDLINK3_MK) +SILGRAPHITE_FT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsilgraphite-ft} -BUILDLINK_PACKAGES+= silgraphite-ft -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}silgraphite-ft - -.if ${SILGRAPHITE_FT_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.silgraphite-ft+= silgraphite-ft>=2.2.0 BUILDLINK_PKGSRCDIR.silgraphite-ft?= ../../graphics/silgraphite-ft -.endif # SILGRAPHITE_FT_BUILDLINK3_MK .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/silgraphite/buildlink3.mk" +.endif # SILGRAPHITE_FT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -silgraphite-ft -- cgit v1.2.3