summaryrefslogtreecommitdiff
path: root/x11/trapproto
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 /x11/trapproto
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 'x11/trapproto')
-rw-r--r--x11/trapproto/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/x11/trapproto/buildlink3.mk b/x11/trapproto/buildlink3.mk
index a5b1777ed1e..7f437de05af 100644
--- a/x11/trapproto/buildlink3.mk
+++ b/x11/trapproto/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/12/17 22:38:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:51 joerg Exp $
BUILDLINK_DEPMETHOD.trapproto?= build
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-TRAPPROTO_BUILDLINK3_MK:= ${TRAPPROTO_BUILDLINK3_MK}+
+BUILDLINK_TREE+= trapproto
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= trapproto
-.endif
+.if !defined(TRAPPROTO_BUILDLINK3_MK)
+TRAPPROTO_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntrapproto}
-BUILDLINK_PACKAGES+= trapproto
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}trapproto
-
-.if ${TRAPPROTO_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.trapproto+= trapproto>=3.4.3
BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto
-.endif # TRAPPROTO_BUILDLINK3_MK
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
+.endif # TRAPPROTO_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -trapproto