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. --- sysutils/xfce4-genmon-plugin/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'sysutils/xfce4-genmon-plugin') diff --git a/sysutils/xfce4-genmon-plugin/buildlink3.mk b/sysutils/xfce4-genmon-plugin/buildlink3.mk index 34d152b3b1b..cedaa9c2aed 100644 --- a/sysutils/xfce4-genmon-plugin/buildlink3.mk +++ b/sysutils/xfce4-genmon-plugin/buildlink3.mk @@ -1,25 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/27 10:48:06 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:27 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:= ${XFCE4_GENMON_PLUGIN_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xfce4-genmon-plugin -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= xfce4-genmon-plugin -.endif +.if !defined(XFCE4_GENMON_PLUGIN_BUILDLINK3_MK) +XFCE4_GENMON_PLUGIN_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-genmon-plugin} -BUILDLINK_PACKAGES+= xfce4-genmon-plugin -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4-genmon-plugin - -.if ${XFCE4_GENMON_PLUGIN_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.xfce4-genmon-plugin+= xfce4-genmon-plugin>=3.1 BUILDLINK_PKGSRCDIR.xfce4-genmon-plugin?= ../../sysutils/xfce4-genmon-plugin -.endif # XFCE4_GENMON_PLUGIN_BUILDLINK3_MK .include "../../x11/xfce4-panel/buildlink3.mk" .include "../../devel/xfce4-dev-tools/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.endif # XFCE4_GENMON_PLUGIN_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xfce4-genmon-plugin -- cgit v1.2.3