From 75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd 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. --- mbone/common-mml/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'mbone') diff --git a/mbone/common-mml/buildlink3.mk b/mbone/common-mml/buildlink3.mk index 80d3be17e21..c7414f469d1 100644 --- a/mbone/common-mml/buildlink3.mk +++ b/mbone/common-mml/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:00 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:59 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMMON_MML_BUILDLINK3_MK:= ${COMMON_MML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= common-mml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= common-mml -.endif +.if !defined(COMMON_MML_BUILDLINK3_MK) +COMMON_MML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncommon-mml} -BUILDLINK_PACKAGES+= common-mml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}common-mml - -.if !empty(COMMON_MML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.common-mml+= common-mml>=1.2.14 BUILDLINK_PKGSRCDIR.common-mml?= ../../mbone/common-mml -.endif # COMMON_MML_BUILDLINK3_MK +.endif # COMMON_MML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -common-mml -- cgit v1.2.3