From owner-freebsd-gecko@FreeBSD.ORG  Wed Jun 17 16:49:42 2015
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@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 71015E35
 for <freebsd-gecko@hub.freebsd.org>; Wed, 17 Jun 2015 16:49:42 +0000 (UTC)
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "trillian.chruetertee.ch",
 Issuer "trillian.chruetertee.ch" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 05FF3E9D
 for <freebsd-gecko@freebsd.org>; Wed, 17 Jun 2015 16:49:41 +0000 (UTC)
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 by trillian.chruetertee.ch (8.14.9/8.14.9) with ESMTP id t5HGnWZL067362
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO)
 for <freebsd-gecko@freebsd.org>; Wed, 17 Jun 2015 16:49:33 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.9/8.14.9/Submit) id t5HGnWab067360
 for freebsd-gecko@freebsd.org; Wed, 17 Jun 2015 16:49:32 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Wed, 17 Jun 2015 16:49:32 GMT
Message-Id: <201506171649.t5HGnWab067360@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
 svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
Subject: [SVN-Commit] r1847 - trunk/Mk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reply-To: freebsd-gecko@freebsd.org
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2015 16:49:42 -0000

Author: jbeich
Date: Wed Jun 17 16:49:31 2015
New Revision: 1847

Log:
sync with ports

Modified:
   trunk/Mk/bsd.gecko.mk

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sat Jun 13 13:41:56 2015	(r1846)
+++ trunk/Mk/bsd.gecko.mk	Wed Jun 17 16:49:31 2015	(r1847)
@@ -4,7 +4,7 @@
 # Date created:		12 Nov 2005
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: head/Mk/bsd.gecko.mk 382370 2015-03-27 07:05:29Z marino $
+# $FreeBSD: head/Mk/bsd.gecko.mk 389557 2015-06-13 22:57:17Z antoine $
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -406,6 +406,9 @@
 # _MAKE_JOBS is only available after bsd.port.post.mk, thus cannot be
 # used in .mozconfig. And client.mk automatically uses -jN where N
 # is what multiprocessing.cpu_count() returns.
+.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
+MAKE_JOBS_NUMBER=	1
+.endif
 .if defined(MAKE_JOBS_NUMBER)
 MOZ_MAKE_FLAGS+=-j${MAKE_JOBS_NUMBER}
 .endif