svn commit: r389315 - in branches/2015Q2/Mk: . Uses

[Bryan Drewery]

Author: bdrewery
Date: Sat Jun 13 03:32:09 2015
New Revision: 389315
URL: https://svnweb.freebsd.org/changeset/ports/389315

Log:
  MFH: r383692
  
  - Make it possible to override _MAKE_JOBS when MAKE_JOBS_NUMBER=1
  - Override it for USES=ninja
  With this commit and r383571, ports using ninja and waf now respect
  MAKE_JOBS_NUMBER when it's equal to 1
  
  PR:		197910
  With hat:	portmgr

Modified:
  branches/2015Q2/Mk/Uses/ninja.mk
  branches/2015Q2/Mk/bsd.port.mk
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/Mk/Uses/ninja.mk
==============================================================================
--- branches/2015Q2/Mk/Uses/ninja.mk	Sat Jun 13 03:16:55 2015	(r389314)
+++ branches/2015Q2/Mk/Uses/ninja.mk	Sat Jun 13 03:32:09 2015	(r389315)
@@ -27,6 +27,8 @@ CMAKE_ARGS+=	-GNinja
 MAKEFILE=
 MAKE_CMD=	ninja
 MAKE_FLAGS=
+# Set a minimal job of 1
+_MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
 _DESTDIR_VIA_ENV=	yes
 
 .endif

Modified: branches/2015Q2/Mk/bsd.port.mk
==============================================================================
--- branches/2015Q2/Mk/bsd.port.mk	Sat Jun 13 03:16:55 2015	(r389314)
+++ branches/2015Q2/Mk/bsd.port.mk	Sat Jun 13 03:32:09 2015	(r389315)
@@ -2061,7 +2061,7 @@ ${lang}FLAGS+=	${${lang}FLAGS_${ARCH}}
 
 # Multiple make jobs support
 .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
-_MAKE_JOBS=		#
+_MAKE_JOBS?=		#
 MAKE_JOBS_NUMBER=	1
 .else
 .if defined(MAKE_JOBS_NUMBER)