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. --- devel/apel/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/apel') diff --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk index e55330412dd..01af086ea61 100644 --- a/devel/apel/buildlink3.mk +++ b/devel/apel/buildlink3.mk @@ -1,24 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:09 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APEL_BUILDLINK3_MK:= ${APEL_BUILDLINK3_MK}+ - .include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= apel -.endif +BUILDLINK_TREE+= apel -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napel} -BUILDLINK_PACKAGES+= apel -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apel +.if !defined(APEL_BUILDLINK3_MK) +APEL_BUILDLINK3_MK:= -.if ${APEL_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.apel+= ${EMACS_PKGNAME_PREFIX}apel>=10 BUILDLINK_PKGSRCDIR.apel?= ../../devel/apel -.endif # APEL_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.apel= ${EGREP} '.*\.el$$|.*\.elc$$' @@ -28,5 +20,6 @@ BUILDLINK_CONTENTS_FILTER.apel= ${EGREP} '.*\.el$$|.*\.elc$$' EMACS_MODULES+= base .endif +.endif # APEL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apel -- cgit v1.2.3