summaryrefslogtreecommitdiff
path: root/cad
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 /cad
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 'cad')
-rw-r--r--cad/gplcver/buildlink3.mk19
-rw-r--r--cad/libgeda/buildlink3.mk19
-rw-r--r--cad/libwcalc/buildlink3.mk19
-rw-r--r--cad/verilog-current/buildlink3.mk19
-rw-r--r--cad/verilog/buildlink3.mk19
5 files changed, 30 insertions, 65 deletions
diff --git a/cad/gplcver/buildlink3.mk b/cad/gplcver/buildlink3.mk
index e7246ed9532..ba4382b6839 100644
--- a/cad/gplcver/buildlink3.mk
+++ b/cad/gplcver/buildlink3.mk
@@ -1,19 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:00 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-GPLCVER_BUILDLINK3_MK:= ${GPLCVER_BUILDLINK3_MK}+
+BUILDLINK_TREE+= gplcver
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= gplcver
-.endif
+.if !defined(GPLCVER_BUILDLINK3_MK)
+GPLCVER_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngplcver}
-BUILDLINK_PACKAGES+= gplcver
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gplcver
-
-.if !empty(GPLCVER_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.gplcver+= gplcver>=2.11a
BUILDLINK_PKGSRCDIR.gplcver?= ../../cad/gplcver
-.endif # GPLCVER_BUILDLINK3_MK
+.endif # GPLCVER_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -gplcver
diff --git a/cad/libgeda/buildlink3.mk b/cad/libgeda/buildlink3.mk
index 32871b05460..be2c2faaf81 100644
--- a/cad/libgeda/buildlink3.mk
+++ b/cad/libgeda/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.25 2009/02/01 05:20:00 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:00 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBGEDA_BUILDLINK3_MK:= ${LIBGEDA_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libgeda
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libgeda
-.endif
+.if !defined(LIBGEDA_BUILDLINK3_MK)
+LIBGEDA_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibgeda}
-BUILDLINK_PACKAGES+= libgeda
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libgeda
-
-.if !empty(LIBGEDA_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libgeda+= libgeda-1.4.3{,nb[0-9]*}
BUILDLINK_ABI_DEPENDS.libgeda?= libgeda-1.4.3{,nb[0-9]*}
BUILDLINK_PKGSRCDIR.libgeda?= ../../cad/libgeda
-.endif # LIBGEDA_BUILDLINK3_MK
.include "../../graphics/gd/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
+.endif # LIBGEDA_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libgeda
diff --git a/cad/libwcalc/buildlink3.mk b/cad/libwcalc/buildlink3.mk
index c3c30f4622f..e5e01c4d5cd 100644
--- a/cad/libwcalc/buildlink3.mk
+++ b/cad/libwcalc/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:00 joerg Exp $
#
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-LIBWCALC_BUILDLINK3_MK:= ${LIBWCALC_BUILDLINK3_MK}+
+BUILDLINK_TREE+= libwcalc
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= libwcalc
-.endif
+.if !defined(LIBWCALC_BUILDLINK3_MK)
+LIBWCALC_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nlibwcalc}
-BUILDLINK_PACKAGES+= libwcalc
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libwcalc
-
-.if !empty(LIBWCALC_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.libwcalc+= libwcalc-1.0*
BUILDLINK_ABI_DEPENDS.libwcalc?= libwcalc>=1.0nb1
BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc
-.endif # LIBWCALC_BUILDLINK3_MK
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
+.endif # LIBWCALC_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -libwcalc
diff --git a/cad/verilog-current/buildlink3.mk b/cad/verilog-current/buildlink3.mk
index cf053840531..79bfd4767c6 100644
--- a/cad/verilog-current/buildlink3.mk
+++ b/cad/verilog-current/buildlink3.mk
@@ -1,20 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/08/11 13:28:08 dmcmahill Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:00 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-VERILOG_CURRENT_BUILDLINK3_MK:= ${VERILOG_CURRENT_BUILDLINK3_MK}+
+BUILDLINK_TREE+= verilog-current
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= verilog-current
-.endif
+.if !defined(VERILOG_CURRENT_BUILDLINK3_MK)
+VERILOG_CURRENT_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nverilog-current}
-BUILDLINK_PACKAGES+= verilog-current
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}verilog-current
-
-.if !empty(VERILOG_CURRENT_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.verilog-current+= verilog-current>=20021019
BUILDLINK_ABI_DEPENDS.verilog-current?= verilog-current>=20060809
BUILDLINK_PKGSRCDIR.verilog-current?= ../../cad/verilog-current
-.endif # VERILOG_CURRENT_BUILDLINK3_MK
+.endif # VERILOG_CURRENT_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -verilog-current
diff --git a/cad/verilog/buildlink3.mk b/cad/verilog/buildlink3.mk
index b867dd46409..52d1cadd260 100644
--- a/cad/verilog/buildlink3.mk
+++ b/cad/verilog/buildlink3.mk
@@ -1,24 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:10:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:00 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-VERILOG_BUILDLINK3_MK:= ${VERILOG_BUILDLINK3_MK}+
+BUILDLINK_TREE+= verilog
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= verilog
-.endif
+.if !defined(VERILOG_BUILDLINK3_MK)
+VERILOG_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nverilog}
-BUILDLINK_PACKAGES+= verilog
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}verilog
-
-.if !empty(VERILOG_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.verilog+= verilog>=0.8.1nb1
BUILDLINK_PKGSRCDIR.verilog?= ../../cad/verilog
-.endif # VERILOG_BUILDLINK3_MK
.include "../../devel/zlib/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/gperf/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
+.endif # VERILOG_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -verilog