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. --- devel/pwlib/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/pwlib') diff --git a/devel/pwlib/buildlink3.mk b/devel/pwlib/buildlink3.mk index 81ff17e136f..b4794c83912 100644 --- a/devel/pwlib/buildlink3.mk +++ b/devel/pwlib/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.14 2008/01/18 05:14:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PWLIB_BUILDLINK3_MK:= ${PWLIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pwlib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pwlib -.endif +.if !defined(PWLIB_BUILDLINK3_MK) +PWLIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npwlib} -BUILDLINK_PACKAGES+= pwlib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pwlib - -.if !empty(PWLIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pwlib+= pwlib>=1.8.3nb1 BUILDLINK_ABI_DEPENDS.pwlib?= pwlib>=1.8.3nb7 BUILDLINK_PKGSRCDIR.pwlib?= ../../devel/pwlib -.endif # PWLIB_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.endif # PWLIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pwlib -- cgit v1.2.3