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. --- textproc/hre/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'textproc/hre') diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk index 7a5ba43806e..899d0a6052a 100644 --- a/textproc/hre/buildlink3.mk +++ b/textproc/hre/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:10 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:29 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HRE_BUILDLINK3_MK:= ${HRE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hre -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hre -.endif +.if !defined(HRE_BUILDLINK3_MK) +HRE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhre} -BUILDLINK_PACKAGES+= hre -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hre - -.if !empty(HRE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hre+= hre>=0.9.7 BUILDLINK_ABI_DEPENDS.hre+= hre>=0.9.8anb1 BUILDLINK_PKGSRCDIR.hre?= ../../textproc/hre -.endif # HRE_BUILDLINK3_MK +.endif # HRE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hre -- cgit v1.2.3