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/wxGTK26/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/wxGTK26') diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk index 259f2dc7111..4aed2f0bde6 100644 --- a/x11/wxGTK26/buildlink3.mk +++ b/x11/wxGTK26/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/09/22 19:58:52 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxGTK -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= wxGTK -.endif +.if !defined(WXGTK_BUILDLINK3_MK) +WXGTK_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK} -BUILDLINK_PACKAGES+= wxGTK -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK - -.if !empty(WXGTK_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.wxGTK+= wxGTK>=2.6.0nb2 BUILDLINK_ABI_DEPENDS.wxGTK+= wxGTK>=2.6.3nb1 BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 -.endif # WXGTK_BUILDLINK3_MK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" @@ -23,5 +15,6 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.endif # WXGTK_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK -- cgit v1.2.3