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. --- pkgtools/compat_headers/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'pkgtools/compat_headers') diff --git a/pkgtools/compat_headers/buildlink3.mk b/pkgtools/compat_headers/buildlink3.mk index c9a401d8335..623c71141f1 100644 --- a/pkgtools/compat_headers/buildlink3.mk +++ b/pkgtools/compat_headers/buildlink3.mk @@ -1,20 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.2 2008/05/25 17:38:37 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -COMPAT_HEADERS_BUILDLINK3_MK:= ${COMPAT_HEADERS_BUILDLINK3_MK}+ +BUILDLINK_TREE+= compat_headers -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= compat_headers -.endif +.if !defined(COMPAT_HEADERS_BUILDLINK3_MK) +COMPAT_HEADERS_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ncompat_headers} -BUILDLINK_PACKAGES+= compat_headers -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}compat_headers - -.if !empty(COMPAT_HEADERS_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.compat_headers+= compat_headers>=0.2 BUILDLINK_PKGSRCDIR.compat_headers?= ../../pkgtools/compat_headers BUILDLINK_DEPMETHOD.compat_headers?= build -.endif # COMPAT_HEADERS_BUILDLINK3_MK +.endif # COMPAT_HEADERS_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -compat_headers -- cgit v1.2.3