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/wxGTK28-contrib/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/wxGTK28-contrib') diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk index 61e8a3f0f55..eb1f3cc4b28 100644 --- a/x11/wxGTK28-contrib/buildlink3.mk +++ b/x11/wxGTK28-contrib/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/09/12 11:15:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -WXGTK28_CONTRIB_BUILDLINK3_MK:= ${WXGTK28_CONTRIB_BUILDLINK3_MK}+ +BUILDLINK_TREE+= wxGTK28-contrib -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= wxGTK28-contrib -.endif +.if !defined(WXGTK28_CONTRIB_BUILDLINK3_MK) +WXGTK28_CONTRIB_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK28-contrib} -BUILDLINK_PACKAGES+= wxGTK28-contrib -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wxGTK28-contrib - -.if ${WXGTK28_CONTRIB_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.wxGTK28-contrib+= wxGTK28-contrib>=2.8.8 BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib -.endif # WXGTK28_CONTRIB_BUILDLINK3_MK .include "../../x11/wxGTK28/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -26,5 +18,6 @@ BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" +.endif # WXGTK28_CONTRIB_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -wxGTK28-contrib -- cgit v1.2.3