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/openssl/buildlink3.mk | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'security/openssl') diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index faf498d7e6f..3be853512e8 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.39 2008/01/17 06:42:47 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2009/03/20 19:25:21 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ +BUILDLINK_TREE+= openssl -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openssl -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenssl} -BUILDLINK_PACKAGES+= openssl -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openssl - -.if !empty(OPENSSL_BUILDLINK3_MK:M+) +.if !defined(OPENSSL_BUILDLINK3_MK) +OPENSSL_BUILDLINK3_MK:= . include "../../mk/bsd.fast.prefs.mk" @@ -26,7 +18,6 @@ WRAPPER_REORDER_CMDS+= reorder:l:crypt:crypto SSLBASE= ${BUILDLINK_PREFIX.openssl} BUILD_DEFS+= SSLBASE -.endif # OPENSSL_BUILDLINK3_MK pkgbase := openssl .include "../../mk/pkg-build-options.mk" @@ -34,5 +25,6 @@ pkgbase := openssl .if !empty(PKG_BUILD_OPTIONS.openssl:Mrsaref) . include "../../security/rsaref/buildlink3.mk" .endif +.endif # OPENSSL_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openssl -- cgit v1.2.3