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. --- x11/liboldXrandr/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/liboldXrandr') diff --git a/x11/liboldXrandr/buildlink3.mk b/x11/liboldXrandr/buildlink3.mk index 18c3b51b6f0..b73ea11e6bd 100644 --- a/x11/liboldXrandr/buildlink3.mk +++ b/x11/liboldXrandr/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.2 2007/05/30 16:00:51 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:47 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= Xrandr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= Xrandr -.endif +.if !defined(XRANDR_BUILDLINK3_MK) +XRANDR_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXrandr} -BUILDLINK_PACKAGES+= Xrandr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Xrandr - -.if !empty(XRANDR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=0.99 BUILDLINK_ABI_DEPENDS.Xrandr+= Xrandr>=1.0.2nb3 BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/liboldXrandr -.endif # XRANDR_BUILDLINK3_MK .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" +.endif # XRANDR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -Xrandr -- cgit v1.2.3