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 /pkgtools/x11-links/xorg.mk | |
| 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 'pkgtools/x11-links/xorg.mk')
| -rw-r--r-- | pkgtools/x11-links/xorg.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index 9600b1917a0..0606645bc6f 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.14 2008/12/04 04:16:41 cube Exp $ +# $NetBSD: xorg.mk,v 1.15 2009/03/20 19:25:13 joerg Exp $ # # This is for X.org, but use "xfree" files also. @@ -76,14 +76,14 @@ FILES_LIST= ${FILESDIR}/xorg # ${X11BASE} actually belong to the base Xorg or not. # # XXX: maybe skip iconv and zlib too? -.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} CHECK_BUILTIN.${_pkg_}:= yes USE_BUILTIN.${_pkg_}= yes . sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" CHECK_BUILTIN.${_pkg_}:= no .endfor -.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} +.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} IGNORE_PKG.${_pkg_}= yes . if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) . if exists(${FILESDIR}/xorg.${_pkg_}) |