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. --- databases/openldap-client/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'databases/openldap-client') diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk index c52c347c1a0..0547cf1ce57 100644 --- a/databases/openldap-client/buildlink3.mk +++ b/databases/openldap-client/buildlink3.mk @@ -1,26 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.7 2008/01/18 05:06:28 tnn Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+ +# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:06 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= openldap-client -.endif +BUILDLINK_TREE+= openldap-client -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nopenldap-client} -BUILDLINK_PACKAGES+= openldap-client -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openldap-client +.if !defined(OPENLDAP_BUILDLINK3_MK) +OPENLDAP_BUILDLINK3_MK:= -.if !empty(OPENLDAP_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.openldap-client+= openldap-client>=2.4.6 BUILDLINK_ABI_DEPENDS.openldap-client?= openldap-client>=2.4.7nb1 BUILDLINK_PKGSRCDIR.openldap-client?= ../../databases/openldap-client # Export the deprecated API from the openldap-2.2.x releases. BUILDLINK_CPPFLAGS.openldap-client+= -DLDAP_DEPRECATED -.endif # OPENLDAP_BUILDLINK3_MK pkgbase := openldap-client .include "../../mk/pkg-build-options.mk" @@ -30,5 +22,6 @@ pkgbase := openldap-client . include "../../security/cyrus-sasl/buildlink3.mk" .endif .include "../../security/openssl/buildlink3.mk" +.endif # OPENLDAP_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -openldap-client -- cgit v1.2.3