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. --- devel/libgnome/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/libgnome') diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index 106884f2fa9..2729d413c47 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.20 2008/04/10 16:40:49 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:24:18 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOME_BUILDLINK3_MK:= ${LIBGNOME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnome -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnome -.endif +.if !defined(LIBGNOME_BUILDLINK3_MK) +LIBGNOME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnome} -BUILDLINK_PACKAGES+= libgnome -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnome - -.if !empty(LIBGNOME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.20.1.1nb1 BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome -.endif # LIBGNOME_BUILDLINK3_MK .include "../../audio/esound/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome .include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.endif # LIBGNOME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnome -- cgit v1.2.3