summaryrefslogtreecommitdiff
path: root/meta-pkgs
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 /meta-pkgs
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 'meta-pkgs')
-rw-r--r--meta-pkgs/xfce4/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/meta-pkgs/xfce4/buildlink3.mk b/meta-pkgs/xfce4/buildlink3.mk
index 6641241ab49..30a7aa756df 100644
--- a/meta-pkgs/xfce4/buildlink3.mk
+++ b/meta-pkgs/xfce4/buildlink3.mk
@@ -1,21 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/01/18 05:08:32 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2009/03/20 19:24:59 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-XFCE4_BUILDLINK3_MK:= ${XFCE4_BUILDLINK3_MK}+
+BUILDLINK_TREE+= xfce4
-.if ${BUILDLINK_DEPTH} == "+"
-BUILDLINK_DEPENDS+= xfce4
-.endif
+.if !defined(XFCE4_BUILDLINK3_MK)
+XFCE4_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4}
-BUILDLINK_PACKAGES+= xfce4
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xfce4
-
-.if ${XFCE4_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.xfce4+= xfce4>=4.4.1
BUILDLINK_ABI_DEPENDS.xfce4?= xfce4>=4.4.2nb1
BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
-.endif # XFCE4_BUILDLINK3_MK
.include "../../audio/xfce4-mixer/buildlink3.mk"
.include "../../editors/xfce4-mousepad/buildlink3.mk"
@@ -36,5 +28,6 @@ BUILDLINK_PKGSRCDIR.xfce4?= ../../meta-pkgs/xfce4
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
+.endif # XFCE4_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -xfce4