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. --- comms/gnome-pilot/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'comms/gnome-pilot') diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk index 340abc55481..79d58ad27ea 100644 --- a/comms/gnome-pilot/buildlink3.mk +++ b/comms/gnome-pilot/buildlink3.mk @@ -1,26 +1,19 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/09/06 20:54:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:02 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNOME_PILOT_BUILDLINK3_MK:= ${GNOME_PILOT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnome-pilot -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnome-pilot -.endif +.if !defined(GNOME_PILOT_BUILDLINK3_MK) +GNOME_PILOT_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-pilot} -BUILDLINK_PACKAGES+= gnome-pilot -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-pilot - -.if !empty(GNOME_PILOT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.12nb2 BUILDLINK_ABI_DEPENDS.gnome-pilot?= gnome-pilot>=2.0.15nb6 BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot -.endif # GNOME_PILOT_BUILDLINK3_MK .include "../../devel/gettext-lib/buildlink3.mk" .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../devel/libglade/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" +.endif # GNOME_PILOT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnome-pilot -- cgit v1.2.3