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. --- devel/gnome-build/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/gnome-build/buildlink3.mk') diff --git a/devel/gnome-build/buildlink3.mk b/devel/gnome-build/buildlink3.mk index 9f679daa620..b4ec2b4d4a6 100644 --- a/devel/gnome-build/buildlink3.mk +++ b/devel/gnome-build/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2008/03/06 14:53:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_BUILD_BUILDLINK3_MK:= ${GNOME_BUILD_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-build -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnome-build -.endif +.if !defined(GNOME_BUILD_BUILDLINK3_MK) +GNOME_BUILD_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-build} -BUILDLINK_PACKAGES+= gnome-build -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-build - -.if ${GNOME_BUILD_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnome-build+= gnome-build>=0.1.3 BUILDLINK_ABI_DEPENDS.gnome-build?= gnome-build>=0.2.0nb1 BUILDLINK_PKGSRCDIR.gnome-build?= ../../devel/gnome-build -.endif # GNOME_BUILD_BUILDLINK3_MK .include "../../devel/gdl/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.gnome-build?= ../../devel/gnome-build .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # GNOME_BUILD_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-build -- cgit v1.2.3