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/db3/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'databases/db3') diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index 7413120912c..f5305c69e68 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.21 2006/12/12 21:52:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+ +BUILDLINK_TREE+= db3 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= db3 -.endif +.if !defined(DB3_BUILDLINK3_MK) +DB3_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndb3} -BUILDLINK_PACKAGES+= db3 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}db3 - -.if !empty(DB3_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.db3+= db3>=2.9.2 BUILDLINK_ABI_DEPENDS.db3+= db3>=3.11.2nb3 BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 @@ -24,8 +17,8 @@ BUILDLINK_TRANSFORM+= l:db-3:db3 BUILDLINK_LIBS.db3= ${BUILDLINK_LDADD.db3} BUILDLINK_TRANSFORM+= l:db:db3 . endif -.endif # DB3_BUILDLINK3_MK .include "../../mk/pthread.buildlink3.mk" +.endif # DB3_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -db3 -- cgit v1.2.3