From owner-svn-ports-branches@FreeBSD.ORG  Sat Jun 13 03:32:10 2015
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C0A9B582;
 Sat, 13 Jun 2015 03:32:10 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ADFD6BE1;
 Sat, 13 Jun 2015 03:32:10 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5D3WAZQ025446;
 Sat, 13 Jun 2015 03:32:10 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5D3WAbp025442;
 Sat, 13 Jun 2015 03:32:10 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201506130332.t5D3WAbp025442@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 13 Jun 2015 03:32:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r389315 - in branches/2015Q2/Mk: . Uses
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jun 2015 03:32:10 -0000

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)