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. --- graphics/libgii/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'graphics/libgii') diff --git a/graphics/libgii/buildlink3.mk b/graphics/libgii/buildlink3.mk index 6cdf45cc3e3..efcb9205294 100644 --- a/graphics/libgii/buildlink3.mk +++ b/graphics/libgii/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2007/02/02 19:17:31 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:42 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGII_BUILDLINK3_MK:= ${LIBGII_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgii -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgii -.endif +.if !defined(LIBGII_BUILDLINK3_MK) +LIBGII_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgii} -BUILDLINK_PACKAGES+= libgii -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgii - -.if !empty(LIBGII_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgii+= libgii>=0.9.0 BUILDLINK_ABI_DEPENDS.libgii?= libgii>=0.9.1nb1 BUILDLINK_PKGSRCDIR.libgii?= ../../graphics/libgii -.endif # LIBGII_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # LIBGII_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgii -- cgit v1.2.3