socsvn commit: r237118 - soc2012/scher/par_ports/head/Mk

[scher at FreeBSD.org]

Author: scher
Date: Tue Jun  5 09:37:48 2012
New Revision: 237118
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237118

Log:
  [new_feature] _parv_PARALLEL_BUILDS_NUMBER variable controls number
  	of parallel builds. May be set by user.
  

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	Tue Jun  5 07:53:22 2012	(r237117)
+++ soc2012/scher/par_ports/head/Mk/bsd.parallel.mk	Tue Jun  5 09:37:48 2012	(r237118)
@@ -58,6 +58,15 @@
 .	endfor
 .endfor
 .endif #!{.TARGETS}
+
+_parv_DEFAULT_PAR_BUILDS_NUM!= sysctl -a | grep hw.n | awk '{print $$2}'
+############### THIS ENTRY IS FOR DEBUGGING PURPOSE  ###############
+############### Custom number of parallel builds for debugging
+_parv_DEFAULT_PAR_BUILDS_NUM= 3
+############### END OF PAR_PORTS SPECIFIC COMMENT LINE  ###############
+.if !defined(_parv_PARALLEL_BUILDS_NUMBER) || ${_parv_PARALLEL_BUILDS_NUMBER} > ${_parv_DEFAULT_PAR_BUILDS_NUM}
+_parv_PARALLEL_BUILDS_NUMBER= ${_parv_DEFAULT_PAR_BUILDS_NUM}
+.endif
 #####################################################
 #####################################################
 # Commands

Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk
==============================================================================
--- soc2012/scher/par_ports/head/Mk/bsd.port.mk	Tue Jun  5 07:53:22 2012	(r237117)
+++ soc2012/scher/par_ports/head/Mk/bsd.port.mk	Tue Jun  5 09:37:48 2012	(r237118)
@@ -1150,6 +1150,11 @@
 .include "${PORTSDIR}/Mk/bsd.parallel.mk"
 .endif
 
+# non-parallel build
+.if !defined(_parv_WANT_PARALLEL_BUILD)
+_parv_PARALLEL_BUILDS_NUMBER= 1
+.endif
+
 .if !target(lock-pkg-dbdir)
 lock-pkg-dbdir:
 	@${DO_NADA}