summaryrefslogtreecommitdiff
path: root/devel/GConf
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 /devel/GConf
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 'devel/GConf')
-rw-r--r--devel/GConf/buildlink3.mk21
1 files changed, 6 insertions, 15 deletions
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index bf2c088432b..0694ec2fad7 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.15 2008/10/09 20:53:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:24:08 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GCONF_BUILDLINK3_MK:= ${GCONF_BUILDLINK3_MK}+
+BUILDLINK_TREE+= GConf
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= GConf
-.endif
+.if !defined(GCONF_BUILDLINK3_MK)
+GCONF_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGConf}
-BUILDLINK_PACKAGES+= GConf
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf
-
-.if !empty(GCONF_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.GConf+= GConf>=2.8.0.1
BUILDLINK_ABI_DEPENDS.GConf?= GConf>=2.12.1nb1
BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
-.endif # GCONF_BUILDLINK3_MK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -25,7 +17,6 @@ BUILDLINK_PKGSRCDIR.GConf?= ../../devel/GConf
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/xmlcatmgr/buildlink3.mk"
-.if !empty(GCONF_BUILDLINK3_MK:M+)
BUILDLINK_TARGETS+= GConf-buildlink-fake
_GCONF_FAKE= ${BUILDLINK_DIR}/bin/gconftool-2
@@ -38,6 +29,6 @@ GConf-buildlink-fake:
${ECHO} "#!${SH}" > ${_GCONF_FAKE}; \
${CHMOD} +x ${_GCONF_FAKE}; \
fi
-.endif # GCONF_BUILDLINK3_MK
+.endif # GCONF_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -GConf