summaryrefslogtreecommitdiff
path: root/sysutils/dbus
diff options
context:
space:
mode:
authorjoerg <joerg>2009-03-20 19:23:50 +0000
committerjoerg <joerg>2009-03-20 19:23:50 +0000
commit405c61d80251d8e80401aed2264d4bede218cb22 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /sysutils/dbus
parentf0f715d4dd4a290c5c6ae716c774f59caf5aa61c (diff)
downloadpkgsrc-405c61d80251d8e80401aed2264d4bede218cb22.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 'sysutils/dbus')
-rw-r--r--sysutils/dbus/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index d01f314dac8..679a718b3fb 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/02/23 11:00:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:23 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-DBUS_BUILDLINK3_MK:= ${DBUS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= dbus
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= dbus
-.endif
+.if !defined(DBUS_BUILDLINK3_MK)
+DBUS_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndbus}
-BUILDLINK_PACKAGES+= dbus
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus
-
-.if !empty(DBUS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.dbus+= dbus>=0.91
BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus
@@ -22,8 +15,8 @@ PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1\/services/ \
{ print "@comment in dbus: " $$0; next }
PRINT_PLIST_AWK+= /^@dirrm share\/dbus-1/ \
{ print "@comment in dbus: " $$0; next }
-.endif # DBUS_BUILDLINK3_MK
.include "../../textproc/expat/buildlink3.mk"
+.endif # DBUS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -dbus