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. --- sysutils/xfce4-thunar/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'sysutils/xfce4-thunar') diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk index 1728459afc9..1aff93314d7 100644 --- a/sysutils/xfce4-thunar/buildlink3.mk +++ b/sysutils/xfce4-thunar/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2008/12/19 23:54:47 hira Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_THUNAR_BUILDLINK3_MK:= ${XFCE4_THUNAR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-thunar -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-thunar -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-thunar} -BUILDLINK_PACKAGES+= xfce4-thunar -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-thunar +.if !defined(XFCE4_THUNAR_BUILDLINK3_MK) +XFCE4_THUNAR_BUILDLINK3_MK:= -.if ${XFCE4_THUNAR_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-thunar+= xfce4-thunar>=0.9.3nb2 BUILDLINK_PKGSRCDIR.xfce4-thunar?= ../../sysutils/xfce4-thunar -.endif # XFCE4_THUNAR_BUILDLINK3_MK pkgbase := xfce4-thunar .include "../../mk/pkg-build-options.mk" @@ -35,5 +27,6 @@ pkgbase := xfce4-thunar .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../mk/fam.buildlink3.mk" +.endif # XFCE4_THUNAR_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-thunar -- cgit v1.2.3