From 022c4606fcc3bd0780b781561db11a457e1b2757 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/gd/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'graphics/gd') diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index 267fce41fb0..24382910cc6 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/11/20 17:25:01 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GD_BUILDLINK3_MK:= ${GD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gd -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gd -.endif +.if !defined(GD_BUILDLINK3_MK) +GD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngd} -BUILDLINK_PACKAGES+= gd -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gd - -.if !empty(GD_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gd+= gd>=2.0.15nb1 BUILDLINK_ABI_DEPENDS.gd+= gd>=2.0.33nb3 BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd -.endif # GD_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gd?= ../../graphics/gd .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # GD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gd -- cgit v1.2.3