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/gnustep-back/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/gnustep-back') diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk index e440b935a4c..1f47ebbae53 100644 --- a/x11/gnustep-back/buildlink3.mk +++ b/x11/gnustep-back/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/01/18 05:09:55 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_BACK_BUILDLINK3_MK:= ${GNUSTEP_BACK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-back -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-back -.endif +.if !defined(GNUSTEP_BACK_BUILDLINK3_MK) +GNUSTEP_BACK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-back} -BUILDLINK_PACKAGES+= gnustep-back -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-back - -.if !empty(GNUSTEP_BACK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-back+= gnustep-back>=0.9.2 BUILDLINK_ABI_DEPENDS.gnustep-back+= gnustep-back>=0.12.0nb1 BUILDLINK_PKGSRCDIR.gnustep-back?= ../../x11/gnustep-back -.endif # GNUSTEP_BACK_BUILDLINK3_MK .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../x11/gnustep-gui/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.endif # GNUSTEP_BACK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-back -- cgit v1.2.3