Date: Mon, 25 Jun 2012 17:39:23 +0000 From: scher@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r238274 - soc2012/scher/par_ports/head/Mk Message-ID: <20120625173924.01382106566B@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scher Date: Mon Jun 25 17:39:23 2012 New Revision: 238274 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238274 Log: [bugfix] Enabled backward compatibility for non-parallel builds. Allows user unput while building ONE dependency in background [fixed] changes in config-recursive target to check only straight deps Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk soc2012/scher/par_ports/head/Mk/bsd.port.mk Modified: soc2012/scher/par_ports/head/Mk/bsd.parallel.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Mon Jun 25 17:10:34 2012 (r238273) +++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk Mon Jun 25 17:39:23 2012 (r238274) @@ -369,7 +369,7 @@ @${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies"; config-recursive: - @for dir in $$(${MAKE} all-depends-list); do \ + @for dir in $$(${MAKE} run-depends-list build-depends-list | uniq); do \ while true; do \ ( cd $$dir; ${MAKE} locking-config-recursive ) || { \ status=$$?; \ Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.port.mk Mon Jun 25 17:10:34 2012 (r238273) +++ soc2012/scher/par_ports/head/Mk/bsd.port.mk Mon Jun 25 17:39:23 2012 (r238274) @@ -5088,12 +5088,10 @@ ${PKG_ADD} $${subpkgfile}; \ fi; \ else \ - log_file="/tmp/ports_logs/dep-$${dir\#\#*/}-parent-${PORTNAME}.log"; \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args 2>> $${log_file} >> $${log_file} ) & spawned=$$!; \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args ) & spawned=$$!; \ fi; \ else \ - log_file="/tmp/ports_logs/dep-$${dir\#\#*/}-parent-$${PORTNAME}.log"; \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args 2>> $${log_file} >> $${log_file} ) & spawned=$$!; \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) & spawned=$$!; \ fi; \ ############### PAR_PORTS SPECIFIC COMMENT LINE ############### @@ -5166,7 +5164,9 @@ done; \ if { [ $${builds_num} -eq ${_parv_PARALLEL_BUILDS_NUMBER} ] || \ ( [ $${builds_num} -gt 0 ] && [ $${\#depends} -eq 0 ] ); }; then \ - echo "---- dependency output ----- : CAN'T SPAWN MORE DEPS! SLEEP... "; \ + if [ ${_parv_WANT_PARALLEL_BUILD} ]; then \ + echo "---- dependency output ----- : CAN'T SPAWN MORE DEPS! SLEEP... "; \ + fi; \ sleep ${CHECK_ACTIVE_TIMEOUT}; \ fi; \ done; \ @@ -5191,7 +5191,6 @@ ############### END OF PAR_PORTS SPECIFIC COMMENT LINE ############### _TERMINATE_PROCESS_TREE= \ - ${_dparv_START_OUTPUT}; \ ${ECHO_CMD} Terminating process tree strating from ${.MAKE.PID}; \ pids_to_kill=${.MAKE.PID}; \ /bin/kill -STOP ${.MAKE.PID} 2> /dev/null || ${DO_NADA}; \ @@ -5211,7 +5210,6 @@ if [ $${\#ppids} -eq 0 ]; then break; fi; \ done; \ ${ECHO_CMD} PIDs to kill: $${pids_to_kill}; \ - ${_dparv_START_OUTPUT}; \ /bin/kill -KILL $${pids_to_kill} 2> /dev/null || ${DO_NADA} ############### PAR_PORTS SPECIFIC COMMENT LINE ###############
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120625173924.01382106566B>