From owner-svn-src-all@FreeBSD.ORG  Wed May 13 10:53:17 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4645D16E;
 Wed, 13 May 2015 10:53:17 +0000 (UTC)
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 346FA1465;
 Wed, 13 May 2015 10:53:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DArHCf006325;
 Wed, 13 May 2015 10:53:17 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DArH4Y006324;
 Wed, 13 May 2015 10:53:17 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201505131053.t4DArH4Y006324@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 13 May 2015 10:53:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282848 - stable/10
X-SVN-Group: stable-10
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.20
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 10:53:17 -0000

Author: ngie
Date: Wed May 13 10:53:16 2015
New Revision: 282848
URL: https://svnweb.freebsd.org/changeset/base/282848

Log:
  MFC r281618,r281823:
  
  r281618:
  
  Defeat race with MK_KERBEROS == yes introduced with bootstrap-tools
  parallelization work done in r279197
  
  - kerberos5/lib/libroken requires kerberos5/tools/make-roken to build
  - kerberos5/tools/asn1_compile, kerberos5/tools/slc, and usr.bin/compile_et
    require kerberos5/lib/libroken and kerberos5/lib/libvers
  
  This race is incredibly evident when cross-building sparc64 on
  ref10-amd64.freebsd.org
  
  Pointyhat to: ngie
  
  r281823:
  
  Serialize all of _kerberos5_bootstrap_tools to avoid build failures involving
  make bootstrap-tools
  
  On the plus side, this also greatly reduces complexity
  
  Pointyhat to: ngie
  Reported by: Willem Jan Withagen <wjw@digiware.nl>

Modified:
  stable/10/Makefile.inc1
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Wed May 13 10:43:49 2015	(r282847)
+++ stable/10/Makefile.inc1	Wed May 13 10:53:16 2015	(r282848)
@@ -1328,8 +1328,7 @@ _kerberos5_bootstrap_tools= \
 	kerberos5/tools/slc \
 	usr.bin/compile_et
 
-${_bt}-kerberos5/tools/slc: ${_bt}-kerberos5/lib/libroken
-${_bt}-kerberos5/tools/asn1_compile: ${_bt}-kerberos5/lib/libroken
+.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
 .if ${_BOOTSTRAP_MAKEINFO} != "no"