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. --- lang/hugs/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'lang/hugs') diff --git a/lang/hugs/buildlink3.mk b/lang/hugs/buildlink3.mk index db123c3da3b..8ac9c3fb232 100644 --- a/lang/hugs/buildlink3.mk +++ b/lang/hugs/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/05 21:04:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HUGS98_BUILDLINK3_MK:= ${HUGS98_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hugs98 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= hugs98 -.endif +.if !defined(HUGS98_BUILDLINK3_MK) +HUGS98_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhugs98} -BUILDLINK_PACKAGES+= hugs98 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hugs98 - -.if ${HUGS98_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.hugs98+= hugs98>=200609 BUILDLINK_PKGSRCDIR.hugs98?= ../../lang/hugs -.endif # HUGS98_BUILDLINK3_MK +.endif # HUGS98_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hugs98 -- cgit v1.2.3