diff options
| author | joerg <joerg> | 2009-03-20 19:23:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-03-20 19:23:50 +0000 |
| commit | 75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd (patch) | |
| tree | 647e974495c5d41703d41ca2e71c9b6063b9153a /lang/gcc34 | |
| parent | 1e5847233e0f63b08e108a58553ab24d554cda0f (diff) | |
| download | pkgsrc-75fb5bb7e7604eb9547fecf17d31c5f8f7bc55fd.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 'lang/gcc34')
| -rw-r--r-- | lang/gcc34/buildlink3.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index edd84d7ee65..d60dde242b9 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.16 2008/07/28 09:48:48 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:24:49 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -GCC34_BUILDLINK3_MK:= ${GCC34_BUILDLINK3_MK}+ BUILDLINK_PREFIX.gcc34:=${LOCALBASE}/gcc34 -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= gcc34 -.endif +BUILDLINK_TREE+= gcc34 -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngcc34} -BUILDLINK_PACKAGES+= gcc34 -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gcc34 +.if !defined(GCC34_BUILDLINK3_MK) +GCC34_BUILDLINK3_MK:= -.if !empty(GCC34_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gcc34+= gcc34>=${_GCC_REQD} BUILDLINK_ABI_DEPENDS.gcc34?= gcc34>=3.4.5nb1 BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34 @@ -31,7 +25,6 @@ BUILDLINK_LIBDIRS.gcc34+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adali BUILDLINK_INCDIRS.gcc34+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include . endif . endif -.endif # GCC34_BUILDLINK3_MK BUILDLINK_FILES_CMD.gcc34= \ (cd ${BUILDLINK_PREFIX.gcc34} && \ @@ -45,8 +38,8 @@ BUILDLINK_DEPMETHOD.gcc34+= full BUILDLINK_DEPMETHOD.gcc34?= build . endif - .include "../../mk/pthread.buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.endif # GCC34_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -gcc34 |