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. --- security/qca2/buildlink3.mk | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'security/qca2') diff --git a/security/qca2/buildlink3.mk b/security/qca2/buildlink3.mk index 8b9685a7332..7a8e2a37c7b 100644 --- a/security/qca2/buildlink3.mk +++ b/security/qca2/buildlink3.mk @@ -1,23 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/19 15:32:42 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:22 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QCA2_BUILDLINK3_MK:= ${QCA2_BUILDLINK3_MK}+ -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qca2 -.endif +BUILDLINK_TREE+= qca2 -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqca2} -BUILDLINK_PACKAGES+= qca2 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca2 +.if !defined(QCA2_BUILDLINK3_MK) +QCA2_BUILDLINK3_MK:= -.if !empty(QCA2_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.qca2+= qca2>=2.0.0 BUILDLINK_ABI_DEPENDS.qca2?= qca2>=2.0.0 BUILDLINK_PKGSRCDIR.qca2?= ../../security/qca2 -.endif # QCA2_BUILDLINK3_MK .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" +.endif # QCA2_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -qca2 -- cgit v1.2.3