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. --- databases/db4/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'databases/db4') diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index 5ab5e630fec..715c72a4cb6 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.34 2008/09/06 20:53:51 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db4 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db4 -.endif +.if !defined(DB4_BUILDLINK3_MK) +DB4_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb4} -BUILDLINK_PACKAGES+= db4 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db4 - -.if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db4+= db4>=4.7.25.1 BUILDLINK_ABI_DEPENDS.db4?= db4>=4.7.25.1 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 @@ -30,6 +23,6 @@ BUILDLINK_TRANSFORM+= l:db:db4 PTHREAD_OPTS+= native . include "../../mk/pthread.buildlink3.mk" . endif -.endif # DB4_BUILDLINK3_MK +.endif # DB4_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db4 -- cgit v1.2.3