summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
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/qt4-libs
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/qt4-libs')
-rw-r--r--x11/qt4-libs/buildlink3.mk19
1 files changed, 6 insertions, 13 deletions
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 747d0c60066..8bfafa0fee5 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,24 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/10/13 12:02:14 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2009/03/20 19:25:50 joerg Exp $
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-QT4_LIBS_BUILDLINK3_MK:= ${QT4_LIBS_BUILDLINK3_MK}+
+BUILDLINK_TREE+= qt4-libs
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= qt4-libs
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt4-libs}
-BUILDLINK_PACKAGES+= qt4-libs
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt4-libs
+.if !defined(QT4_LIBS_BUILDLINK3_MK)
+QT4_LIBS_BUILDLINK3_MK:=
-.if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0
BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.1.2nb1
BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
BUILDLINK_INCDIRS.qt4-libs+= qt4/include
BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib
-.endif # QT4_LIBS_BUILDLINK3_MK
QTDIR= ${BUILDLINK_PREFIX.qt4-libs}/qt4
BUILDLINK_PASSTHRU_DIRS+= ${QTDIR}
@@ -50,5 +42,6 @@ MAKE_ENV+= QTDIR=${QTDIR:Q}
CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
MAKE_ENV+= MOC="${QTDIR}/bin/moc"
+.endif # QT4_LIBS_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_TREE+= -qt4-libs