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. --- chat/gale/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'chat/gale/buildlink3.mk') diff --git a/chat/gale/buildlink3.mk b/chat/gale/buildlink3.mk index ebc6008fee2..9d7e3f24066 100644 --- a/chat/gale/buildlink3.mk +++ b/chat/gale/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/01/18 05:06:24 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:01 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GALE_BUILDLINK3_MK:= ${GALE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gale -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gale -.endif +.if !defined(GALE_BUILDLINK3_MK) +GALE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngale} -BUILDLINK_PACKAGES+= gale -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gale - -.if !empty(GALE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gale+= gale>=0.99f BUILDLINK_ABI_DEPENDS.gale?= gale>=0.99fnb2 BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale -.endif # GALE_BUILDLINK3_MK .include "../../devel/boehm-gc/buildlink3.mk" .include "../../devel/glib/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.gale?= ../../chat/gale .include "../../net/adns/buildlink3.mk" .include "../../security/rsaref/buildlink3.mk" .include "../../www/libwww/buildlink3.mk" +.endif # GALE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gale -- cgit v1.2.3