From 405c61d80251d8e80401aed2264d4bede218cb22 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. --- devel/at-spi/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/at-spi') diff --git a/devel/at-spi/buildlink3.mk b/devel/at-spi/buildlink3.mk index 7608c57db10..cf365d38838 100644 --- a/devel/at-spi/buildlink3.mk +++ b/devel/at-spi/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/10/16 12:26:36 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:09 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -AT_SPI_BUILDLINK3_MK:= ${AT_SPI_BUILDLINK3_MK}+ +BUILDLINK_TREE+= at-spi -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= at-spi -.endif +.if !defined(AT_SPI_BUILDLINK3_MK) +AT_SPI_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nat-spi} -BUILDLINK_PACKAGES+= at-spi -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}at-spi - -.if !empty(AT_SPI_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.at-spi+= at-spi>=1.6.0 BUILDLINK_ABI_DEPENDS.at-spi+= at-spi>=1.7.7nb1 BUILDLINK_PKGSRCDIR.at-spi?= ../../devel/at-spi -.endif # AT_SPI_BUILDLINK3_MK .include "../../devel/atk/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libXtst/buildlink3.mk" +.endif # AT_SPI_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -at-spi -- cgit v1.2.3