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. --- databases/libgnomedb/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'databases/libgnomedb/buildlink3.mk') diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk index 53e62fb6405..95c7c65d57e 100644 --- a/databases/libgnomedb/buildlink3.mk +++ b/databases/libgnomedb/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.23 2008/01/18 05:06:27 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2009/03/20 19:24:05 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBGNOMEDB_BUILDLINK3_MK:= ${LIBGNOMEDB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libgnomedb -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libgnomedb -.endif +.if !defined(LIBGNOMEDB_BUILDLINK3_MK) +LIBGNOMEDB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgnomedb} -BUILDLINK_PACKAGES+= libgnomedb -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgnomedb - -.if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libgnomedb+= libgnomedb>=2.99.2 BUILDLINK_ABI_DEPENDS.libgnomedb+= libgnomedb>=3.0.0nb2 BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb -.endif # LIBGNOMEDB_BUILDLINK3_MK .include "../../databases/libgda/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.libgnomedb?= ../../databases/libgnomedb .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtksourceview/buildlink3.mk" +.endif # LIBGNOMEDB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libgnomedb -- cgit v1.2.3