summaryrefslogtreecommitdiff
path: root/ham
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-03-20 19:23:50 +0000
committerjoerg <joerg@pkgsrc.org>2009-03-20 19:23:50 +0000
commit2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /ham
parent4bf0a20854ae9e07b7965977a713f2efee890976 (diff)
downloadpkgsrc-2d1ba244e90207d03eef397a99aa4091baeec5b3.tar.gz
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.
Diffstat (limited to 'ham')
-rw-r--r--ham/gnuradio-core/buildlink3.mk19
-rw-r--r--ham/gnuradio-wxgui/buildlink3.mk19
-rw-r--r--ham/hamlib/buildlink3.mk19
-rw-r--r--ham/usrp/buildlink3.mk19
4 files changed, 24 insertions, 52 deletions
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
diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk
index 9bd64ee6105..7210746d523 100644
--- a/ham/gnuradio-wxgui/buildlink3.mk
+++ b/ham/gnuradio-wxgui/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/08/08 03:23:20 wulf Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:46 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GNURADIO_WXGUI_BUILDLINK3_MK:= ${GNURADIO_WXGUI_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gnuradio-wxgui
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= gnuradio-wxgui
-.endif
+.if !defined(GNURADIO_WXGUI_BUILDLINK3_MK)
+GNURADIO_WXGUI_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnuradio-wxgui}
-BUILDLINK_PACKAGES+= gnuradio-wxgui
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnuradio-wxgui
-
-.if ${GNURADIO_WXGUI_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.gnuradio-wxgui+= gnuradio-wxgui>=3.0.4
BUILDLINK_PKGSRCDIR.gnuradio-wxgui?= ../../ham/gnuradio-wxgui
-.endif # GNURADIO_WXGUI_BUILDLINK3_MK
.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../x11/py-wxWidgets/buildlink3.mk"
+.endif # GNURADIO_WXGUI_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gnuradio-wxgui
diff --git a/ham/hamlib/buildlink3.mk b/ham/hamlib/buildlink3.mk
index 8071d92222c..cbbb4a08a03 100644
--- a/ham/hamlib/buildlink3.mk
+++ b/ham/hamlib/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:53 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:46 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-HAMLIB_BUILDLINK3_MK:= ${HAMLIB_BUILDLINK3_MK}+
+BUILDLINK_TREE+= hamlib
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= hamlib
-.endif
+.if !defined(HAMLIB_BUILDLINK3_MK)
+HAMLIB_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nhamlib}
-BUILDLINK_PACKAGES+= hamlib
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}hamlib
-
-.if !empty(HAMLIB_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.hamlib+= hamlib>=1.1.4
BUILDLINK_ABI_DEPENDS.hamlib+= hamlib>=1.2.5
BUILDLINK_PKGSRCDIR.hamlib?= ../../ham/hamlib
-.endif # HAMLIB_BUILDLINK3_MK
+.endif # HAMLIB_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -hamlib
diff --git a/ham/usrp/buildlink3.mk b/ham/usrp/buildlink3.mk
index 58caf473c6f..d5493f4a490 100644
--- a/ham/usrp/buildlink3.mk
+++ b/ham/usrp/buildlink3.mk
@@ -1,22 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/08/08 03:24:47 wulf Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:24:46 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-USRP_BUILDLINK3_MK:= ${USRP_BUILDLINK3_MK}+
+BUILDLINK_TREE+= usrp
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= usrp
-.endif
+.if !defined(USRP_BUILDLINK3_MK)
+USRP_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nusrp}
-BUILDLINK_PACKAGES+= usrp
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}usrp
-
-.if ${USRP_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.usrp+= usrp>=3.0.4
BUILDLINK_PKGSRCDIR.usrp?= ../../ham/usrp
-.endif # USRP_BUILDLINK3_MK
.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../devel/libusb/buildlink3.mk"
+.endif # USRP_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -usrp