From 022c4606fcc3bd0780b781561db11a457e1b2757 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/florist/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/florist') diff --git a/devel/florist/buildlink3.mk b/devel/florist/buildlink3.mk index 8ccd09f5be5..d16cee6594e 100644 --- a/devel/florist/buildlink3.mk +++ b/devel/florist/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:42 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FLORIST_BUILDLINK3_MK:= ${FLORIST_BUILDLINK3_MK}+ +BUILDLINK_TREE+= florist -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= florist -.endif +.if !defined(FLORIST_BUILDLINK3_MK) +FLORIST_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nflorist} -BUILDLINK_PACKAGES+= florist -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}florist - -.if !empty(FLORIST_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.florist+= florist>=3.15p BUILDLINK_ABI_DEPENDS.florist?= florist>=3.15pnb2 BUILDLINK_PKGSRCDIR.florist?= ../../devel/florist -.endif # FLORIST_BUILDLINK3_MK +.endif # FLORIST_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -florist -- cgit v1.2.3