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. --- ham/gnuradio-core/buildlink3.mk | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'ham/gnuradio-core') diff --git a/ham/gnuradio-core/buildlink3.mk b/ham/gnuradio-core/buildlink3.mk index 5c342c75eb6..32ff780ee0a 100644 --- a/ham/gnuradio-core/buildlink3.mk +++ b/ham/gnuradio-core/buildlink3.mk @@ -1,21 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/08/08 03:05:05 wulf Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:24:46 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GNURADIO_CORE_BUILDLINK3_MK:= ${GNURADIO_CORE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= gnuradio-core -.if ${BUILDLINK_DEPTH} == "+" -BUILDLINK_DEPENDS+= gnuradio-core -.endif +.if !defined(GNURADIO_CORE_BUILDLINK3_MK) +GNURADIO_CORE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnuradio-core} -BUILDLINK_PACKAGES+= gnuradio-core -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnuradio-core - -.if ${GNURADIO_CORE_BUILDLINK3_MK} == "+" BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.0.4 BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core BUILDLINK_CPPFLAGS.gnuradio-core+= -I${BUILDLINK_PREFIX.gnuradio-core}/include/gnuradio -.endif # GNURADIO_CORE_BUILDLINK3_MK .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/cppunit/buildlink3.mk" @@ -24,5 +16,6 @@ BUILDLINK_CPPFLAGS.gnuradio-core+= -I${BUILDLINK_PREFIX.gnuradio-core}/includ .include "../../lang/python/extension.mk" .include "../../lang/python/pyversion.mk" .include "../../math/fftwf/buildlink3.mk" +.endif # GNURADIO_CORE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gnuradio-core -- cgit v1.2.3