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. --- x11/libXcomposite/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'x11/libXcomposite') diff --git a/x11/libXcomposite/buildlink3.mk b/x11/libXcomposite/buildlink3.mk index afbada7ca60..debc91da2a8 100644 --- a/x11/libXcomposite/buildlink3.mk +++ b/x11/libXcomposite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2006/12/15 20:16:18 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -6,28 +6,21 @@ .include "../../x11/Xcomposite/buildlink3.mk" .else -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -LIBXCOMPOSITE_BUILDLINK3_MK:= ${LIBXCOMPOSITE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= libXcomposite -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= libXcomposite -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NlibXcomposite} -BUILDLINK_PACKAGES+= libXcomposite -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libXcomposite +.if !defined(LIBXCOMPOSITE_BUILDLINK3_MK) +LIBXCOMPOSITE_BUILDLINK3_MK:= -.if ${LIBXCOMPOSITE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.3.1 BUILDLINK_PKGSRCDIR.libXcomposite?= ../../x11/libXcomposite -.endif # LIBXCOMPOSITE_BUILDLINK3_MK .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" +.endif # LIBXCOMPOSITE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -libXcomposite .endif -- cgit v1.2.3