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. --- x11/libunique/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/libunique') diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk index e3fdd437f01..e718ddd1ae8 100644 --- a/x11/libunique/buildlink3.mk +++ b/x11/libunique/buildlink3.mk @@ -1,20 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/12/18 00:32:14 ahoka Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:47 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBUNIQUE_BUILDLINK3_MK:= ${LIBUNIQUE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libunique -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libunique -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibunique} -BUILDLINK_PACKAGES+= libunique -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libunique +.if !defined(LIBUNIQUE_BUILDLINK3_MK) +LIBUNIQUE_BUILDLINK3_MK:= -.if ${LIBUNIQUE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libunique+= libunique>=1.0.4 BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique -.endif # LIBUNIQUE_BUILDLINK3_MK pkgbase := libunique .include "../../mk/pkg-build-options.mk" @@ -24,5 +16,6 @@ pkgbase := libunique .endif .include "../../x11/gtk2/buildlink3.mk" +.endif # LIBUNIQUE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libunique -- cgit v1.2.3