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. --- devel/glibmm/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/glibmm') diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk index 092bcd552f2..44e06c76f96 100644 --- a/devel/glibmm/buildlink3.mk +++ b/devel/glibmm/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:03:35 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:14 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GLIBMM_BUILDLINK3_MK:= ${GLIBMM_BUILDLINK3_MK}+ +BUILDLINK_TREE+= glibmm -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= glibmm -.endif +.if !defined(GLIBMM_BUILDLINK3_MK) +GLIBMM_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nglibmm} -BUILDLINK_PACKAGES+= glibmm -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glibmm - -.if !empty(GLIBMM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.glibmm+= glibmm>=2.6.1 BUILDLINK_ABI_DEPENDS.glibmm+= glibmm>=2.8.3nb1 BUILDLINK_PKGSRCDIR.glibmm?= ../../devel/glibmm -.endif # GLIBMM_BUILDLINK3_MK .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libsigc++/buildlink3.mk" +.endif # GLIBMM_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -glibmm -- cgit v1.2.3