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/gnustep-base/buildlink3.mk | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'devel/gnustep-base') diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk index 42ea1067841..0571c40321c 100644 --- a/devel/gnustep-base/buildlink3.mk +++ b/devel/gnustep-base/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.13 2008/01/18 05:14:33 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNUSTEP_BASE_BUILDLINK3_MK:= ${GNUSTEP_BASE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnustep-base -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gnustep-base -.endif +.if !defined(GNUSTEP_BASE_BUILDLINK3_MK) +GNUSTEP_BASE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnustep-base} -BUILDLINK_PACKAGES+= gnustep-base -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-base - -.if !empty(GNUSTEP_BASE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gnustep-base+= gnustep-base>=1.9.1 BUILDLINK_ABI_DEPENDS.gnustep-base+= gnustep-base>=1.14.1nb1 BUILDLINK_PKGSRCDIR.gnustep-base?= ../../devel/gnustep-base @@ -53,13 +46,12 @@ PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Librar PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources\/gnustep-base\/NSTimeZones$$/ { next; } PRINT_PLIST_AWK+= /^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Libraries\/Resources\/gnustep-base\/NSTimeZones\/zones$$/ { next; } -.endif # GNUSTEP_BASE_BUILDLINK3_MK - .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ffcall/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../devel/gnustep-make/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # GNUSTEP_BASE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnustep-base -- cgit v1.2.3