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. --- lang/ocaml/buildlink3.mk | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'lang/ocaml') diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 25bbe97e927..a853e9295e1 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,18 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.21 2008/01/23 20:42:25 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/03/20 19:24:51 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ +BUILDLINK_TREE+= ocaml -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= ocaml -.endif +.if !defined(OCAML_BUILDLINK3_MK) +OCAML_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nocaml} -BUILDLINK_PACKAGES+= ocaml - -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ocaml - -.if !empty(OCAML_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2 BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.09.1nb2 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml @@ -48,7 +40,6 @@ ocaml-wrappers: ${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/"$$w" \ ${BUILDLINK_DIR}/bin/"$$w"; \ done +.endif # OCAML_BUILDLINK3_MK -.endif # OCAML_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -ocaml -- cgit v1.2.3