From 75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd 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. --- graphics/hicolor-icon-theme/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'graphics/hicolor-icon-theme') diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index 9b962ab5cc0..414226c49b8 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/01/13 16:27:24 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:40 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -HICOLOR_ICON_THEME_BUILDLINK3_MK:= ${HICOLOR_ICON_THEME_BUILDLINK3_MK}+ +BUILDLINK_TREE+= hicolor-icon-theme -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= hicolor-icon-theme -.endif +.if !defined(HICOLOR_ICON_THEME_BUILDLINK3_MK) +HICOLOR_ICON_THEME_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhicolor-icon-theme} -BUILDLINK_PACKAGES+= hicolor-icon-theme -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hicolor-icon-theme - -.if !empty(HICOLOR_ICON_THEME_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.9nb1 BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme @@ -53,6 +46,6 @@ guic-buildlink-fake: ${CHMOD} +x ${_GUIC_FAKE}; \ fi .endif # HICOLOR_ICON_THEME_DEPEND_ONLY -.endif # HICOLOR_ICON_THEME_BUILDLINK3_MK +.endif # HICOLOR_ICON_THEME_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -hicolor-icon-theme -- cgit v1.2.3