From 2d1ba244e90207d03eef397a99aa4091baeec5b3 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. --- graphics/py-imaging/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'graphics/py-imaging') diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk index b75bdf77033..fe0ff5899d6 100644 --- a/graphics/py-imaging/buildlink3.mk +++ b/graphics/py-imaging/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 17:30:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:44 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PY_IMAGING_BUILDLINK3_MK:= ${PY_IMAGING_BUILDLINK3_MK}+ +BUILDLINK_TREE+= pyimaging -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pyimaging -.endif +.if !defined(PY_IMAGING_BUILDLINK3_MK) +PY_IMAGING_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npyimaging} -BUILDLINK_PACKAGES+= pyimaging -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyimaging - -.if !empty(PY_IMAGING_BUILDLINK3_MK:M+) .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4 BUILDLINK_ABI_DEPENDS.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.5nb1 BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging -.endif # PY_IMAGING_BUILDLINK3_MK .include "../../graphics/jpeg/buildlink3.mk" +.endif # PY_IMAGING_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -pyimaging -- cgit v1.2.3