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/ghc/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'lang/ghc') diff --git a/lang/ghc/buildlink3.mk b/lang/ghc/buildlink3.mk index e491a06f560..71608b33e54 100644 --- a/lang/ghc/buildlink3.mk +++ b/lang/ghc/buildlink3.mk @@ -1,27 +1,20 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/07/20 00:26:52 kristerw Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:50 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GHC_BUILDLINK3_MK:= ${GHC_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ghc -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ghc -.endif +.if !defined(GHC_BUILDLINK3_MK) +GHC_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nghc} -BUILDLINK_PACKAGES+= ghc -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ghc - -.if !empty(GHC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ghc+= ghc>=6.8.3 BUILDLINK_ABI_DEPENDS.ghc?= ghc>=6.8.3 BUILDLINK_PKGSRCDIR.ghc?= ../../lang/ghc BUILDLINK_DEPMETHOD.ghc?= build -.endif # GHC_BUILDLINK3_MK .include "../../devel/readline/buildlink3.mk" +.endif # GHC_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ghc # We include gmp/buildlink3.mk here so that "gmp" is registered as a # direct dependency for any package that includes this buildlink3.mk -- cgit v1.2.3