summaryrefslogtreecommitdiff
path: root/devel/apr
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
commit022c4606fcc3bd0780b781561db11a457e1b2757 (patch)
tree647e974495c5d41703d41ca2e71c9b6063b9153a /devel/apr
parentdf774e13d463dae87662491d7021d1153d110ece (diff)
downloadpkgsrc-022c4606fcc3bd0780b781561db11a457e1b2757.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/apr')
-rw-r--r--devel/apr/buildlink3.mk20
1 files changed, 6 insertions, 14 deletions
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index ee4e092a637..7da8b958260 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,17 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.31 2007/06/30 15:04:55 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2009/03/20 19:24:09 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
+BUILDLINK_TREE+= apr
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= apr
-.endif
+.if !defined(APR_BUILDLINK3_MK)
+APR_BUILDLINK3_MK:=
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napr}
-BUILDLINK_PACKAGES+= apr
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apr
-
-.if !empty(APR_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.apr+= apr>=1.2.8
BUILDLINK_PKGSRCDIR.apr?= ../../devel/apr
BUILDLINK_INCDIRS.apr?= include/apr-1
@@ -23,7 +16,6 @@ ${BUILDLINK_DIR}/bin/apr-config: buildlink-directories
${MKDIR} ${BUILDLINK_DIR}/bin && ${LN} -fs apr-1-config ${BUILDLINK_DIR}/bin/apr-config
buildlink-apr-cookie: ${BUILDLINK_DIR}/bin/apr-config
+.endif # APR_BUILDLINK3_MK
-.endif # APR_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -apr