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. --- www/tidy/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'www/tidy') diff --git a/www/tidy/buildlink3.mk b/www/tidy/buildlink3.mk index 2da1799d4aa..6f42308976d 100644 --- a/www/tidy/buildlink3.mk +++ b/www/tidy/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/04/09 09:01:52 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:38 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -TIDY_BUILDLINK3_MK:= ${TIDY_BUILDLINK3_MK}+ +BUILDLINK_TREE+= tidy -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= tidy -.endif +.if !defined(TIDY_BUILDLINK3_MK) +TIDY_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntidy} -BUILDLINK_PACKAGES+= tidy -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}tidy - -.if !empty(TIDY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.tidy+= tidy>=20080324 BUILDLINK_PKGSRCDIR.tidy?= ../../www/tidy -.endif # TIDY_BUILDLINK3_MK +.endif # TIDY_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -tidy -- cgit v1.2.3