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. --- x11/Xcomposite/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/Xcomposite') diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk index 5cc83b00570..7e310da356e 100644 --- a/x11/Xcomposite/buildlink3.mk +++ b/x11/Xcomposite/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/07 13:59:35 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:39 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XCOMPOSITE_BUILDLINK3_MK:= ${XCOMPOSITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xcomposite -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xcomposite -.endif +.if !defined(XCOMPOSITE_BUILDLINK3_MK) +XCOMPOSITE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXcomposite} -BUILDLINK_PACKAGES+= Xcomposite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xcomposite - -.if !empty(XCOMPOSITE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xcomposite+= Xcomposite>=1.0.1 BUILDLINK_ABI_DEPENDS.Xcomposite?= Xcomposite>=1.0.1nb2 BUILDLINK_PKGSRCDIR.Xcomposite?= ../../x11/Xcomposite -.endif # XCOMPOSITE_BUILDLINK3_MK .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" +.endif # XCOMPOSITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xcomposite -- cgit v1.2.3