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. --- lang/gcc3-objc/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'lang/gcc3-objc') diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 64ed5f7b571..12ed022bbf1 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,19 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC3_OBJC_BUILDLINK3_MK:= ${GCC3_OBJC_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:49 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc3-objc -.endif +BUILDLINK_TREE+= gcc3-objc -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc3-objc} -BUILDLINK_PACKAGES+= gcc3-objc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc3-objc +.if !defined(GCC3_OBJC_BUILDLINK3_MK) +GCC3_OBJC_BUILDLINK3_MK:= -.if !empty(GCC3_OBJC_BUILDLINK3_MK:M+) . if defined(GCC3_INSTALLTO_SUBPREFIX) . if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} @@ -31,6 +24,6 @@ BUILDLINK_DEPMETHOD.gcc3-objc+= full . else BUILDLINK_DEPMETHOD.gcc3-objc?= build . endif -.endif # GCC3_OBJC_BUILDLINK3_MK +.endif # GCC3_OBJC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc3-objc -- cgit v1.2.3