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. --- wm/windowmaker/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'wm/windowmaker') diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk index d7c24c774c3..51ca1001946 100644 --- a/wm/windowmaker/buildlink3.mk +++ b/wm/windowmaker/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= windowmaker -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= windowmaker -.endif +.if !defined(WINDOWMAKER_BUILDLINK3_MK) +WINDOWMAKER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nwindowmaker} -BUILDLINK_PACKAGES+= windowmaker -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}windowmaker - -.if !empty(WINDOWMAKER_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3 BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb7 BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker -.endif # WINDOWMAKER_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.endif # WINDOWMAKER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -windowmaker -- cgit v1.2.3