From 405c61d80251d8e80401aed2264d4bede218cb22 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. --- x11/xview-lib/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/xview-lib') diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk index 5af97e6b220..79a300645a5 100644 --- a/x11/xview-lib/buildlink3.mk +++ b/x11/xview-lib/buildlink3.mk @@ -1,22 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.8 2008/08/30 20:01:28 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:55 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xview-lib -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xview-lib -.endif +.if !defined(XVIEW_LIB_BUILDLINK3_MK) +XVIEW_LIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxview-lib} -BUILDLINK_PACKAGES+= xview-lib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xview-lib - -.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1 BUILDLINK_ABI_DEPENDS.xview-lib?= xview-lib>=3.2.1nb7 BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib -.endif # XVIEW_LIB_BUILDLINK3_MK .include "../../x11/libX11/buildlink3.mk" +.endif # XVIEW_LIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xview-lib -- cgit v1.2.3