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. --- cross/binutils/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'cross') diff --git a/cross/binutils/buildlink3.mk b/cross/binutils/buildlink3.mk index 747e2655af8..bbfcccb0eac 100644 --- a/cross/binutils/buildlink3.mk +++ b/cross/binutils/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/08/24 19:53:44 kristerw Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:04 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -CROSS_BINUTILS_BUILDLINK3_MK:= ${CROSS_BINUTILS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= cross-binutils -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= cross-binutils -.endif +.if !defined(CROSS_BINUTILS_BUILDLINK3_MK) +CROSS_BINUTILS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncross-binutils} -BUILDLINK_PACKAGES+= cross-binutils -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cross-binutils - -.if !empty(CROSS_BINUTILS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.cross-binutils+= cross-binutils>=2.17.0.0 BUILDLINK_PKGSRCDIR.cross-binutils?= ../../cross/binutils -.endif # CROSS_BINUTILS_BUILDLINK3_MK +.endif # CROSS_BINUTILS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -cross-binutils -- cgit v1.2.3