From 75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd 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. --- textproc/xmlcatmgr/buildlink3.mk | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'textproc/xmlcatmgr') diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk index 57416be2337..41f88a5fa1c 100644 --- a/textproc/xmlcatmgr/buildlink3.mk +++ b/textproc/xmlcatmgr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:11 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:34 joerg Exp $ # # This Makefile fragment is included by packages that use xmlcatmgr. # @@ -12,18 +12,11 @@ # type of tool they are. # -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -XMLCATMGR_BUILDLINK3_MK:= ${XMLCATMGR_BUILDLINK3_MK}+ +BUILDLINK_TREE+= xmlcatmgr -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= xmlcatmgr -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxmlcatmgr} -BUILDLINK_PACKAGES+= xmlcatmgr -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xmlcatmgr +.if !defined(XMLCATMGR_BUILDLINK3_MK) +XMLCATMGR_BUILDLINK3_MK:= -.if !empty(XMLCATMGR_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr @@ -43,7 +36,6 @@ XML_DEFAULT_CATALOG= ${PKG_SYSCONFBASEDIR}/xml/catalog PRINT_PLIST_AWK+= /^@dirrm share\/(sgml|xml)$$/ \ { print "@comment in xmlcatmgr: " $$0; next } +.endif # XMLCATMGR_BUILDLINK3_MK -.endif # XMLCATMGR_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -xmlcatmgr -- cgit v1.2.3