Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Jun 2012 18:44:56 +0000
From:      scher@FreeBSD.org
To:        svn-soc-all@FreeBSD.org
Subject:   socsvn commit: r238278 - soc2012/scher/par_ports/head/Mk
Message-ID:  <20120625184456.DF16B106566C@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 ###############
 #



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120625184456.DF16B106566C>