svn commit: r282848 - stable/10

[Garrett Cooper]

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 at 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"