diff options
| author | ngie <ngie@FreeBSD.org> | 2015-05-13 10:53:16 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-05-13 10:53:16 +0000 |
| commit | d1180c911c16179c89c3acbcbbbee5dc0aa05b84 (patch) | |
| tree | 9d32a378d19ce8b3cd727cf46330787a9c88973b /Makefile.inc1 | |
| parent | 4c8cc209abd9d3d8663cc45eab899b756d73ae3d (diff) | |
| download | FreeBSD-src-d1180c911c16179c89c3acbcbbbee5dc0aa05b84.zip FreeBSD-src-d1180c911c16179c89c3acbcbbbee5dc0aa05b84.tar.gz | |
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>
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 93f5306..7280ad8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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" |
