summaryrefslogtreecommitdiff
path: root/x11/modular-xorg-server
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 /x11/modular-xorg-server
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 'x11/modular-xorg-server')
-rw-r--r--x11/modular-xorg-server/buildlink3.mk20
1 files changed, 6 insertions, 14 deletions
diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk
index 346543bf537..b9309873cfd 100644
--- a/x11/modular-xorg-server/buildlink3.mk
+++ b/x11/modular-xorg-server/buildlink3.mk
@@ -1,22 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.5 2008/09/18 20:56:01 bjs Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:47 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-MODULAR_XORG_SERVER_BUILDLINK3_MK:= ${MODULAR_XORG_SERVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+= modular-xorg-server
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= modular-xorg-server
-.endif
+.if !defined(MODULAR_XORG_SERVER_BUILDLINK3_MK)
+MODULAR_XORG_SERVER_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nmodular-xorg-server}
-BUILDLINK_PACKAGES+= modular-xorg-server
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}modular-xorg-server
-
-.if ${MODULAR_XORG_SERVER_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.4.2
BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
-.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
-
.include "../../x11/pixman/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
@@ -28,5 +19,6 @@ BUILDLINK_PKGSRCDIR.modular-xorg-server?= ../../x11/modular-xorg-server
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xf86driproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
+.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -modular-xorg-server