From owner-svn-soc-all@FreeBSD.ORG Mon Jun 25 18:44:59 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id DF16B106566C for ; Mon, 25 Jun 2012 18:44:56 +0000 (UTC) (envelope-from scher@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 25 Jun 2012 18:44:56 +0000 Date: Mon, 25 Jun 2012 18:44:56 +0000 From: scher@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120625184456.DF16B106566C@hub.freebsd.org> Cc: Subject: socsvn commit: r238278 - soc2012/scher/par_ports/head/Mk X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 18:44:59 -0000 Author: scher Date: Mon Jun 25 18:44:56 2012 New Revision: 238278 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238278 Log: [fixed] Non-parallel dependency builds are run as fg processes Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.port.mk Mon Jun 25 17:50:11 2012 (r238277) +++ soc2012/scher/par_ports/head/Mk/bsd.port.mk Mon Jun 25 18:44:56 2012 (r238278) @@ -5088,10 +5088,20 @@ ${PKG_ADD} $${subpkgfile}; \ fi; \ else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args ) & spawned=$$!; \ + if [ ${_parv_WANT_PARALLEL_BUILD} ]; then \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args ) & spawned=$$!; \ + else \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args); \ + spawned="yes"; \ + fi; \ fi; \ else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) & spawned=$$!; \ + if [ ${_parv_WANT_PARALLEL_BUILD} ]; then \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args ) & spawned=$$!; \ + else \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args); \ + spawned="yes"; \ + fi; \ fi; \ ############### PAR_PORTS SPECIFIC COMMENT LINE ############### @@ -5110,6 +5120,7 @@ # ############### END OF PAR_PORTS SPECIFIC COMMENT LINE ############### +.if defined(_parv_WANT_PARALLEL_BUILD) _PROCESS_ACTIVE_BUILDS= \ echo "---- dependency output ----- : --- ENTER _PROCESS_ACTIVE_BUILDS SECTION "; \ while true; do \ @@ -5171,6 +5182,9 @@ fi; \ done; \ echo "---- dependency output ----- : --- LEAVE _PROCESS_ACTIVE_BUILDS SECTION " +.else +_PROCESS_ACTIVE_BUILDS= ${DO_NADA} +.endif ############### PAR_PORTS SPECIFIC COMMENT LINE ############### #