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. --- textproc/libcroco/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'textproc/libcroco') diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk index f9b83caa12e..c4aec5d6ba8 100644 --- a/textproc/libcroco/buildlink3.mk +++ b/textproc/libcroco/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.21 2009/02/20 20:02:30 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:25:30 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libcroco -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libcroco -.endif +.if !defined(LIBCROCO_BUILDLINK3_MK) +LIBCROCO_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibcroco} -BUILDLINK_PACKAGES+= libcroco -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libcroco - -.if !empty(LIBCROCO_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.0 BUILDLINK_ABI_DEPENDS.libcroco+= libcroco>=0.6.1nb7 BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco -.endif # LIBCROCO_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.endif # LIBCROCO_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libcroco -- cgit v1.2.3