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. --- net/bind9/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'net/bind9') diff --git a/net/bind9/buildlink3.mk b/net/bind9/buildlink3.mk index 6fc2c42c86b..9ef1a184ea2 100644 --- a/net/bind9/buildlink3.mk +++ b/net/bind9/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.12 2008/01/18 05:08:40 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:07 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -BIND_BUILDLINK3_MK:= ${BIND_BUILDLINK3_MK}+ +BUILDLINK_TREE+= bind -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bind -.endif +.if !defined(BIND_BUILDLINK3_MK) +BIND_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbind} -BUILDLINK_PACKAGES+= bind -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}bind - -.if !empty(BIND_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.bind+= bind>=9.2.2 BUILDLINK_ABI_DEPENDS.bind+= bind>=9.4.1pl1nb2 BUILDLINK_PKGSRCDIR.bind?= ../../net/bind9 BUILDLINK_INCDIRS.bind?= include/bind BUILDLINK_LDFLAGS.bind?= ${BUILDLINK_LDADD.bind} -.endif # BIND_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # BIND_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -bind -- cgit v1.2.3