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. --- devel/gettext-lib/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'devel/gettext-lib') diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index c77c894ab1e..a8f231fe88f 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,23 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.30 2008/02/27 22:10:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2009/03/20 19:24:13 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GETTEXT_BUILDLINK3_MK:= ${GETTEXT_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gettext -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gettext -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngettext} -BUILDLINK_PACKAGES+= gettext -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gettext +.if !defined(GETTEXT_BUILDLINK3_MK) +GETTEXT_BUILDLINK3_MK:= -.if !empty(GETTEXT_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.14.5 BUILDLINK_PKGSRCDIR.gettext?= ../../devel/gettext-lib BUILDLINK_LIBNAME.gettext= intl BUILDLINK_LDADD.gettext= ${BUILDLINK_LIBNAME.gettext:S/^/-l/:S/^-l$//} BUILDLINK_LDADD.gettext+= ${BUILDLINK_LDADD.iconv} -.endif # GETTEXT_BUILDLINK3_MK .include "../../mk/bsd.fast.prefs.mk" @@ -44,5 +36,6 @@ USE_BUILTIN.iconv= yes .endif .include "../../converters/libiconv/buildlink3.mk" +.endif # GETTEXT_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gettext -- cgit v1.2.3