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. --- net/GeoIP/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'net/GeoIP') diff --git a/net/GeoIP/buildlink3.mk b/net/GeoIP/buildlink3.mk index c7edfc62a11..efa000ac3d0 100644 --- a/net/GeoIP/buildlink3.mk +++ b/net/GeoIP/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GEOIP_BUILDLINK3_MK:= ${GEOIP_BUILDLINK3_MK}+ +BUILDLINK_TREE+= GeoIP -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= GeoIP -.endif +.if !defined(GEOIP_BUILDLINK3_MK) +GEOIP_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeoIP} -BUILDLINK_PACKAGES+= GeoIP -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GeoIP - -.if !empty(GEOIP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.GeoIP+= GeoIP>=1.3.1 BUILDLINK_ABI_DEPENDS.GeoIP+= GeoIP>=1.3.4nb1 BUILDLINK_PKGSRCDIR.GeoIP?= ../../net/GeoIP -.endif # GEOIP_BUILDLINK3_MK +.endif # GEOIP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -GeoIP -- cgit v1.2.3