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 /www/apache22 | |
| 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 'www/apache22')
| -rw-r--r-- | www/apache22/buildlink3.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/www/apache22/buildlink3.mk b/www/apache22/buildlink3.mk index 162c4cbacf1..89383370fd0 100644 --- a/www/apache22/buildlink3.mk +++ b/www/apache22/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2008/09/06 20:54:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:35 joerg Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ +BUILDLINK_TREE+= apache -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= apache -.endif +.if !defined(APACHE_BUILDLINK3_MK) +APACHE_BUILDLINK3_MK:= -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Napache} -BUILDLINK_PACKAGES+= apache -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}apache - -.if !empty(APACHE_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.apache+= apache>=2.2.3 BUILDLINK_ABI_DEPENDS.apache?= apache>=2.2.9nb3 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache22 @@ -26,9 +19,9 @@ APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs . if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} . endif -.endif # APACHE_BUILDLINK3_MK .include "../../devel/apr/buildlink3.mk" .include "../../devel/apr-util/buildlink3.mk" +.endif # APACHE_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apache |