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. --- lang/sun-jdk15/buildlink3.mk | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'lang/sun-jdk15') diff --git a/lang/sun-jdk15/buildlink3.mk b/lang/sun-jdk15/buildlink3.mk index a496d4bf7b8..f60ceab0294 100644 --- a/lang/sun-jdk15/buildlink3.mk +++ b/lang/sun-jdk15/buildlink3.mk @@ -1,17 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:52 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -SUN_JDK15_BUILDLINK3_MK:= ${SUN_JDK15_BUILDLINK3_MK}+ +BUILDLINK_TREE+= sun-jdk15 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= sun-jdk15 -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsun-jdk15} -BUILDLINK_PACKAGES+= sun-jdk15 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}sun-jdk15 - -.if !empty(SUN_JDK15_BUILDLINK3_MK:M+) +.if !defined(SUN_JDK15_BUILDLINK3_MK) +SUN_JDK15_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk15+= sun-jdk15-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk15?= sun-jdk15>=5.0.6nb1 @@ -25,7 +17,6 @@ BUILDLINK_CPPFLAGS.sun-jdk15= \ -I${BUILDLINK_JAVA_PREFIX.sun-jre15}/include/linux .include "../../lang/sun-jre15/buildlink3.mk" +.endif # SUN_JDK15_BUILDLINK3_MK -.endif # SUN_JDK15_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -sun-jdk15 -- cgit v1.2.3