diff options
| author | joerg <joerg@pkgsrc.org> | 2009-03-20 19:23:50 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-03-20 19:23:50 +0000 |
| commit | 2d1ba244e90207d03eef397a99aa4091baeec5b3 (patch) | |
| tree | 647e974495c5d41703d41ca2e71c9b6063b9153a /www/apache | |
| parent | 4bf0a20854ae9e07b7965977a713f2efee890976 (diff) | |
| download | pkgsrc-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 'www/apache')
| -rw-r--r-- | www/apache/buildlink3.mk | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk index 52b1fc1030e..fa3783b17af 100644 --- a/www/apache/buildlink3.mk +++ b/www/apache/buildlink3.mk @@ -1,17 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:11:12 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 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-1.3.* BUILDLINK_ABI_DEPENDS.apache?= apache>=1.3.34nb5 BUILDLINK_PKGSRCDIR.apache?= ../../www/apache @@ -32,7 +25,6 @@ CONFIGURE_ARGS+= --with-apxs=${APXS:Q} # required because httpd/os.h includes <dlfcn.h> when it is found by # Apache's configure script. .include "../../mk/dlopen.buildlink3.mk" +.endif # APACHE_BUILDLINK3_MK -.endif # APACHE_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_TREE+= -apache |