svn commit: r383692 - in head/Mk: . Uses

[Antoine Brodin]

Author: antoine
Date: Fri Apr 10 05:45:15 2015
New Revision: 383692
URL: https://svnweb.freebsd.org/changeset/ports/383692

Log:
  - 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:
  head/Mk/Uses/ninja.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/Uses/ninja.mk
==============================================================================
--- head/Mk/Uses/ninja.mk	Fri Apr 10 05:11:54 2015	(r383691)
+++ head/Mk/Uses/ninja.mk	Fri Apr 10 05:45:15 2015	(r383692)
@@ -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: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Apr 10 05:11:54 2015	(r383691)
+++ head/Mk/bsd.port.mk	Fri Apr 10 05:45:15 2015	(r383692)
@@ -2039,7 +2039,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)