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. --- textproc/py-xml/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'textproc/py-xml') diff --git a/textproc/py-xml/buildlink3.mk b/textproc/py-xml/buildlink3.mk index 3a8fe4c9b2d..94abda313b3 100644 --- a/textproc/py-xml/buildlink3.mk +++ b/textproc/py-xml/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 17:30:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PYXML_BUILDLINK3_MK:= ${PYXML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyxml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyxml -.endif +.if !defined(PYXML_BUILDLINK3_MK) +PYXML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyxml} -BUILDLINK_PACKAGES+= pyxml -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyxml - -.if !empty(PYXML_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyxml+= ${PYPKGPREFIX}-xml>=0.8.3nb1 BUILDLINK_ABI_DEPENDS.pyxml?= ${PYPKGPREFIX}-xml>=0.8.4nb2 BUILDLINK_PKGSRCDIR.pyxml?= ../../textproc/py-xml -.endif # PYXML_BUILDLINK3_MK .include "../../textproc/expat/buildlink3.mk" +.endif # PYXML_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyxml -- cgit v1.2.3