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. --- graphics/lcms/buildlink3.mk | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'graphics/lcms') diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk index 3cef04af615..c32a6d96c8c 100644 --- a/graphics/lcms/buildlink3.mk +++ b/graphics/lcms/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:41 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LCMS_BUILDLINK3_MK:= ${LCMS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= lcms -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= lcms -.endif +.if !defined(LCMS_BUILDLINK3_MK) +LCMS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlcms} -BUILDLINK_PACKAGES+= lcms -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}lcms - -.if !empty(LCMS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.lcms+= lcms>=1.06 BUILDLINK_ABI_DEPENDS.lcms+= lcms>=1.12nb2 BUILDLINK_PKGSRCDIR.lcms?= ../../graphics/lcms @@ -28,7 +21,6 @@ buildlink-include-lcms: ${LN} -s ${BUILDLINK_PREFIX.lcms}/include/${_h_} ${BUILDLINK_DIR}/include/lcms/${_h_}; \ fi .endfor +.endif # LCMS_BUILDLINK3_MK -.endif # LCMS_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -lcms -- cgit v1.2.3