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. --- parallel/pvm3/buildlink3.mk | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'parallel/pvm3') diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk index 00cb5e9639c..152701e13cc 100644 --- a/parallel/pvm3/buildlink3.mk +++ b/parallel/pvm3/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:05 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PVM_BUILDLINK3_MK:= ${PVM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pvm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pvm -.endif +.if !defined(PVM_BUILDLINK3_MK) +PVM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npvm} -BUILDLINK_PACKAGES+= pvm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pvm - -.if !empty(PVM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pvm+= pvm>=3.4.3 BUILDLINK_ABI_DEPENDS.pvm+= pvm>=3.4.5nb1 BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 @@ -19,7 +12,6 @@ BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 . include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk" BUILDLINK_INCDIRS.pvm?= pvm3/include BUILDLINK_LIBDIRS.pvm?= pvm3/lib/${PVM_ARCH} +.endif # PVM_BUILDLINK3_MK -.endif # PVM_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pvm -- cgit v1.2.3