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. --- editors/emacs21-nox11/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'editors/emacs21-nox11') diff --git a/editors/emacs21-nox11/buildlink3.mk b/editors/emacs21-nox11/buildlink3.mk index 4d203b93838..29efa0e0e24 100644 --- a/editors/emacs21-nox11/buildlink3.mk +++ b/editors/emacs21-nox11/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:31 joerg Exp $ # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -EMACS_NOX11_BUILDLINK3_MK:= ${EMACS_NOX11_BUILDLINK3_MK}+ +BUILDLINK_TREE+= emacs-nox11 -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= emacs-nox11 -.endif +.if !defined(EMACS_NOX11_BUILDLINK3_MK) +EMACS_NOX11_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nemacs-nox11} -BUILDLINK_PACKAGES+= emacs-nox11 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}emacs-nox11 - -.if ${EMACS_NOX11_BUILDLINK3_MK} == "+" .include "../../editors/emacs/modules.mk" BUILDLINK_API_DEPENDS.emacs-nox11+= ${_EMACS_REQD} BUILDLINK_PKGSRCDIR.emacs-nox11?= ${_EMACS_PKGDIR} -.endif # EMACS_NOX11_BUILDLINK3_MK BUILDLINK_CONTENTS_FILTER.emacs-nox11= ${EGREP} '.*\.el$$|.*\.elc$$' +.endif # EMACS_NOX11_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -emacs-nox11 -- cgit v1.2.3