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. --- textproc/redland/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'textproc/redland') diff --git a/textproc/redland/buildlink3.mk b/textproc/redland/buildlink3.mk index bc010794240..1dac5ba5423 100644 --- a/textproc/redland/buildlink3.mk +++ b/textproc/redland/buildlink3.mk @@ -1,24 +1,17 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/11/04 10:39:40 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:32 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -REDLAND_BUILDLINK3_MK:= ${REDLAND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= redland -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= redland -.endif +.if !defined(REDLAND_BUILDLINK3_MK) +REDLAND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nredland} -BUILDLINK_PACKAGES+= redland -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}redland - -.if ${REDLAND_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.redland+= redland>=1.0.7 BUILDLINK_PKGSRCDIR.redland?= ../../textproc/redland -.endif # REDLAND_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" .include "../../textproc/raptor/buildlink3.mk" .include "../../textproc/rasqal/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" +.endif # REDLAND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -redland -- cgit v1.2.3