pkgsrc-Bugs archive

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

Re: pkg/34139



The following reply was made to PR pkg/34139; it has been noted by GNATS.

From: Sergey Svishchev <svs+pr%grep.ru@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/34139
Date: Fri, 23 Feb 2007 12:59:48 +0300

 --9jxsPFA5p3P2qPhR
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Disposition: inline
 
 For some reason, bsd.bulk-pkg.mk does not pass MAKEFLAGS (and thus
 _PATH_ORIG) to sub-makes, so this bug is still open for bulk builds.
 
 -- 
 Sergey Svishchev
 
 --9jxsPFA5p3P2qPhR
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="34149.diff"
 
 --- mk/bulk/bsd.bulk-pkg.mk    24 Jan 2007 01:37:20 -0000      1.134
 +++ mk/bulk/bsd.bulk-pkg.mk    12 Feb 2007 20:23:27 -0000
 @@ -239,7 +239,7 @@
  bulk-cache:
        @${BULK_MSG} "Installing BULK_PREREQ packages"
  .for __prereq in ${BULK_PREREQ} lang/perl5
 -      cd ${PKGSRCDIR}/${__prereq} && ${RECURSIVE_MAKE} bulk-install
 +      cd ${PKGSRCDIR}/${__prereq} && ${RECURSIVE_MAKE} ${MAKEFLAGS} 
bulk-install
  .endfor
        ${RM} -f ${BULK_DBFILE}
        ${TOUCH} ${BULK_DBFILE}
 @@ -374,7 +374,7 @@
                        done ;\
                fi; \
                ${BULK_MSG} "Bulk building ${PKGNAME}" ; \
 -              ${DO} ${RECURSIVE_MAKE} clean;\
 +              ${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} clean;\
                if [ "${PRECLEAN}" = "yes" ]; then \
                        ${BULK_MSG} "Currently installed packages:"; \
                        ${PKG_INFO} -e "*" | ${SED} -e "s,^,* ,"; \
 @@ -436,7 +436,7 @@
                        ${DO}       ${RM} -f ${_INTERACTIVE_COOKIE} ; \
                fi ;\
                ${ECHO_MSG} ${MAKE} package '(${PKGNAME})' 2>&1 ; \
 -              ${DO} ${RECURSIVE_MAKE} package; \
 +              ${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} package; \
                ) 2>&1 | ${TEE} -a ${_BUILDLOG:Q} ; \
                if [ -f ${PKGFILE} ]; then \
                        case ${KEEP_BUILDLOGS} in                       \
 @@ -468,7 +468,7 @@
                        ${BULK_MSG} "${PKGNAME} was marked as broken:" ; \
                        ${LS} -la ${_BROKENFILE:Q} ; \
                        ${ECHO_MSG} ${MAKE} deinstall ; \
 -                      ${DO}       ${RECURSIVE_MAKE} deinstall ; \
 +                      ${DO}       ${RECURSIVE_MAKE} ${MAKEFLAGS} deinstall ; \
                        ${ECHO} "</pre>" >> ${_BROKENFILE:Q}; \
                        nbrokenby=0;\
                        if [ "${USE_BULK_CACHE}" = "yes" ]; then \
 @@ -487,15 +487,15 @@
                                                ${ECHO} "<li>$$pkgname 
($$pkgdir)</li>";\
                                                pkgerr='-1'; pkgignore=''; 
pkgskip=''; \
                                                if [ "${USE_BULK_BROKEN_CHECK}" 
= 'yes' ]; then \
 -                                                      pkgignore=`(cd 
${PKGSRCDIR}/$$pkgdir && ${RECURSIVE_MAKE} show-var VARNAME=PKG_FAIL_REASON)`; \
 -                                                      pkgskip=`(cd 
${PKGSRCDIR}/$$pkgdir && ${RECURSIVE_MAKE} show-var VARNAME=PKG_SKIP_REASON)`; \
 +                                                      pkgignore=`(cd 
${PKGSRCDIR}/$$pkgdir && ${RECURSIVE_MAKE} ${MAKEFLAGS} show-var 
VARNAME=PKG_FAIL_REASON)`; \
 +                                                      pkgskip=`(cd 
${PKGSRCDIR}/$$pkgdir && ${RECURSIVE_MAKE} ${MAKEFLAGS} show-var 
VARNAME=PKG_SKIP_REASON)`; \
                                                fi; \
                                                if [ ! -z 
"$${pkgignore}$${pkgskip}" -a ! -f "$${pkg_brokenfile}" ]; then \
                                                        { ${BULK_MSG} 
"$$pkgname ($$pkgdir) may not be packaged because:"; \
                                                          ${BULK_MSG} 
"$$pkgignore"; \
                                                          ${BULK_MSG} 
"$$pkgskip"; \
                                                        } >> 
"$${pkg_brokenfile}"; \
 -                                                      if [ 
"${USE_BULK_BROKEN_CHECK}" != 'yes' ] || [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && 
${RECURSIVE_MAKE} show-var VARNAME=BROKEN)`" ]; then \
 +                                                      if [ 
"${USE_BULK_BROKEN_CHECK}" != 'yes' ] || [ -z "`(cd ${PKGSRCDIR}/$$pkgdir && 
${RECURSIVE_MAKE} ${MAKEFLAGS} show-var VARNAME=BROKEN)`" ]; then \
                                                                pkgerr="0"; \
                                                        else \
                                                                pkgerr="1"; \
 @@ -529,7 +529,7 @@
                fi;                                                     \
                case ${_PRESERVE_WRKDIR} in                             \
                yes|YES)        ;;                                      \
 -              *)      ${DO} ${RECURSIVE_MAKE} clean;;                 \
 +              *)      ${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} clean;;            
        \
                esac;                                                   \
        fi
        @if [ ! -f ${PKGFILE} ]; then \
 @@ -563,16 +563,16 @@
  # been modified and need rebuilding.
  .PHONY: bulk-install
  bulk-install:
 -      @if [ `${RECURSIVE_MAKE} bulk-check-uptodate REF=${PKGFILE}` = 1 ]; 
then \
 +      @if [ `${RECURSIVE_MAKE} ${MAKEFLAGS} bulk-check-uptodate 
REF=${PKGFILE}` = 1 ]; then \
                if ${PKG_INFO} -qe ${PKGNAME} ; then :; \
                else \
 -                      ${DO} ${RECURSIVE_MAKE} install-depends ; \
 +                      ${DO} ${RECURSIVE_MAKE} ${MAKEFLAGS} install-depends ; \
                        ${BULK_MSG} ${PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \
                        ${DO} ${PKG_ADD} ${PKG_ARGS_ADD} ${PKGFILE} ; \
                fi ; \
        else \
                ${ECHO_MSG} ${MAKE} bulk-package PRECLEAN=no; \
 -              ${DO}       ${RECURSIVE_MAKE} bulk-package PRECLEAN=no; \
 +              ${DO}       ${RECURSIVE_MAKE} ${MAKEFLAGS} bulk-package 
PRECLEAN=no; \
        fi
  
  bulk-info: .PHONY
 
 --9jxsPFA5p3P2qPhR--
 



Home | Main Index | Thread Index | Old Index