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. --- databases/metakit-lib/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'databases/metakit-lib') diff --git a/databases/metakit-lib/buildlink3.mk b/databases/metakit-lib/buildlink3.mk index cef0ca31a17..b5f410b4628 100644 --- a/databases/metakit-lib/buildlink3.mk +++ b/databases/metakit-lib/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:40 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:06 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -METAKIT_LIB_BUILDLINK3_MK:= ${METAKIT_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= metakit-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= metakit-lib -.endif +.if !defined(METAKIT_LIB_BUILDLINK3_MK) +METAKIT_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmetakit-lib} -BUILDLINK_PACKAGES+= metakit-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}metakit-lib - -.if !empty(METAKIT_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.metakit-lib+= metakit-lib>=2.4.8 BUILDLINK_ABI_DEPENDS.metakit-lib+= metakit-lib>=2.4.9.3nb1 BUILDLINK_PKGSRCDIR.metakit-lib?= ../../databases/metakit-lib -.endif # METAKIT_LIB_BUILDLINK3_MK +.endif # METAKIT_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -metakit-lib -- cgit v1.2.3