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. --- security/libtcpa/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'security/libtcpa') diff --git a/security/libtcpa/buildlink3.mk b/security/libtcpa/buildlink3.mk index 1461b7d3bf5..a071eb50c74 100644 --- a/security/libtcpa/buildlink3.mk +++ b/security/libtcpa/buildlink3.mk @@ -1,23 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.10 2008/01/18 05:09:38 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:20 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBTCPA_BUILDLINK3_MK:= ${LIBTCPA_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libtcpa -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= libtcpa -.endif +.if !defined(LIBTCPA_BUILDLINK3_MK) +LIBTCPA_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibtcpa} -BUILDLINK_PACKAGES+= libtcpa -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libtcpa - -.if !empty(LIBTCPA_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.libtcpa+= libtcpa>=1.1b BUILDLINK_ABI_DEPENDS.libtcpa?= libtcpa>=1.1bnb3 BUILDLINK_PKGSRCDIR.libtcpa?= ../../security/libtcpa BUILDLINK_DEPMETHOD.libtcpa?= build -.endif # LIBTCPA_BUILDLINK3_MK .include "../../security/openssl/buildlink3.mk" +.endif # LIBTCPA_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libtcpa -- cgit v1.2.3