diff options
| author | kristerw <kristerw@pkgsrc.org> | 2005-11-05 15:02:28 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2005-11-05 15:02:28 +0000 |
| commit | 1a69e27f403e73cac220916d27063a4351052462 (patch) | |
| tree | e7d982c4256ac379f5cc39a37f519dcd0c11c6b2 | |
| parent | 94954ddd5c98019c905945625635f8b6bf9c8f00 (diff) | |
| download | pkgsrc-1a69e27f403e73cac220916d27063a4351052462.tar.gz | |
Remove the cleaning of pre-requisite packages before and after building
a package.
This functionality consumed an enormous amount and time, and did not
do much useful work:
* It is not needed when doing a bulk build of the full pkgrsrc tree,
since the pre-requisite packages already have been built and cleaned.
* It does not work when doing a bulk build of a subset of the packages,
since it only cleans the direct dependencies, and not the full list.
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index d4012e03f76..5150786f95a 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.88 2005/10/27 13:04:54 tv Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.89 2005/11/05 15:02:28 kristerw Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -311,15 +311,9 @@ bulk-package: done ;\ fi; \ ${ECHO_MSG} "BULK> Full rebuild in progress..." ; \ - ${ECHO_MSG} "BULK> Cleaning package ${PKGNAME} and pre-requisite packages" ;\ - if [ "${USE_BULK_CACHE}" = "yes" ]; then \ - for pkgdir in ${PKGPATH} `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}`; do \ - ${DO} (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \ - done ;\ - else \ - ${ECHO_MSG} ${MAKE} clean CLEANDEPENDS=YES;\ - ${DO} ${MAKE} clean CLEANDEPENDS=YES;\ - fi; \ + ${ECHO_MSG} "BULK> Cleaning package ${PKGNAME}" ;\ + ${ECHO_MSG} ${MAKE} clean;\ + ${DO} ${MAKE} clean;\ if [ "${PRECLEAN}" = "yes" ]; then \ ${ECHO_MSG} "BULK> Removing installed packages which are not needed to build ${PKGNAME}" ; \ for pkgname in `${PKG_INFO} -e \*` ; \ @@ -455,15 +449,9 @@ bulk-package: fi ; \ case ${_PRESERVE_WRKDIR} in \ yes|YES) ;; \ - *) ${ECHO_MSG} "BULK> Cleaning package ${PKGNAME} and pre-requisite packages"; \ - if [ "${USE_BULK_CACHE}" = "yes" ]; then \ - for pkgdir in ${PKGPATH} `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}`; do \ - ${DO} (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \ - done; \ - else \ - ${ECHO_MSG} ${MAKE} clean CLEANDEPENDS=YES;\ - ${DO} ${MAKE} clean CLEANDEPENDS=YES; \ - fi ;; \ + *) ${ECHO_MSG} "BULK> Cleaning package ${PKGNAME}"; \ + ${ECHO_MSG} ${MAKE} clean;\ + ${DO} ${MAKE} clean; \ esac; \ fi @if [ ! -f ${PKGFILE} ]; then \ |