pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/bulk Remove the cleaning of pre-requisite packages ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e437aebe1074
branches:  trunk
changeset: 502512:e437aebe1074
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat Nov 05 15:02:28 2005 +0000

description:
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.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  26 +++++++-------------------
 1 files changed, 7 insertions(+), 19 deletions(-)

diffs (47 lines):

diff -r 683c067f9638 -r e437aebe1074 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Sat Nov 05 14:33:17 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Sat Nov 05 15:02:28 2005 +0000
@@ -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@localhost>
@@ -311,15 +311,9 @@
                        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 @@
                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 \



Home | Main Index | Thread Index | Old Index