From owner-svn-src-all@freebsd.org  Mon Jan 13 19:30:19 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 572EC1E9DBA;
 Mon, 13 Jan 2020 19:30:19 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47xNwC1fP6z44w9;
 Mon, 13 Jan 2020 19:30:19 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 33EC69862;
 Mon, 13 Jan 2020 19:30:19 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00DJUJpl052869;
 Mon, 13 Jan 2020 19:30:19 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00DJUJeW052868;
 Mon, 13 Jan 2020 19:30:19 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <202001131930.00DJUJeW052868@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 13 Jan 2020 19:30:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r356697 - stable/12/usr.sbin/mergemaster
X-SVN-Group: stable-12
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: stable/12/usr.sbin/mergemaster
X-SVN-Commit-Revision: 356697
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2020 19:30:19 -0000

Author: bdrewery
Date: Mon Jan 13 19:30:18 2020
New Revision: 356697
URL: https://svnweb.freebsd.org/changeset/base/356697

Log:
  MFC r355379,r355381:
  
    r355379:
      Run make in parallel.
    r355381:
      Use full path to sysctl(8) since /sbin is not in PATH.

Modified:
  stable/12/usr.sbin/mergemaster/mergemaster.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- stable/12/usr.sbin/mergemaster/mergemaster.sh	Mon Jan 13 19:22:52 2020	(r356696)
+++ stable/12/usr.sbin/mergemaster/mergemaster.sh	Mon Jan 13 19:30:18 2020	(r356697)
@@ -508,6 +508,7 @@ SOURCEDIR=$(realpath "$SOURCEDIR")
 
 # Setup make to use system files from SOURCEDIR
 MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON"
+MM_MAKE="${MM_MAKE} -j$(/sbin/sysctl -n hw.ncpu)"
 
 # Check DESTDIR against the mergemaster mtree database to see what
 # files the user changed from the reference files.