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. --- security/openvas-server/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'security/openvas-server/buildlink3.mk') diff --git a/security/openvas-server/buildlink3.mk b/security/openvas-server/buildlink3.mk index cc0ad5d109f..0d3ec0e0715 100644 --- a/security/openvas-server/buildlink3.mk +++ b/security/openvas-server/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/01/04 01:11:55 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENVAS_SERVER_BUILDLINK3_MK:= ${OPENVAS_SERVER_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openvas-server -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= openvas-server -.endif +.if !defined(OPENVAS_SERVER_BUILDLINK3_MK) +OPENVAS_SERVER_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenvas-server} -BUILDLINK_PACKAGES+= openvas-server -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openvas-server - -.if ${OPENVAS_SERVER_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.openvas-server+= openvas-server>=2.0.0 BUILDLINK_PKGSRCDIR.openvas-server?= ../../security/openvas-server -.endif # OPENVAS_SERVER_BUILDLINK3_MK +.endif # OPENVAS_SERVER_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openvas-server -- cgit v1.2.3