svn commit: r281618 - head

Garrett Cooper ngie at FreeBSD.org
Thu Apr 16 21:45:08 UTC 2015


Author: ngie
Date: Thu Apr 16 21:45:07 2015
New Revision: 281618
URL: https://svnweb.freebsd.org/changeset/base/281618

Log:
  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
  
  MFC after: 1 week
  Pointyhat to: ngie

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Apr 16 21:44:35 2015	(r281617)
+++ head/Makefile.inc1	Thu Apr 16 21:45:07 2015	(r281618)
@@ -1357,8 +1357,13 @@ _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
+${_bt}-kerberos5/lib/libroken: ${_bt}-kerberos5/tools/make-roken
+${_bt}-kerberos5/tools/asn1_compile: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-kerberos5/tools/slc: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
+${_bt}-usr.bin/compile_et: \
+    ${_bt}-kerberos5/lib/libroken ${_bt}-kerberos5/lib/libvers
 .endif
 
 bootstrap-tools: .PHONY


More information about the svn-src-head mailing list