From 3abde52372805b0c23a04b2d26c0c28bb1d7dcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= Date: Mon, 23 Dec 2013 14:23:17 +0000 Subject: [PATCH] Try and fix the dependency/bootstrap issues in kerberos5 libkafs5 needs a header from libkrb5, it includes this from ${.OBJDIR}/mumble, this used to work fine as long as you happen to have a krb_err.h in your base system, this doesn't work for bootstrapping or using a cross-compiler with a different sysroot. This is just a best-effort bandaid, sufficient parallelism can still break it. Fix a SRCS override that dropped krb5_err.h. Discussed with: stas --- kerberos5/lib/Makefile | 4 +++- kerberos5/lib/libkafs5/Makefile | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index d1d44e014777..d88bb5b1bd7b 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -2,7 +2,9 @@ # $FreeBSD$ SUBDIR= libasn1 libgssapi_krb5 libgssapi_ntlm libgssapi_spnego libhdb \ - libheimntlm libhx509 libkadm5clnt libkadm5srv libkafs5 libkrb5 \ + libheimntlm libhx509 libkadm5clnt libkadm5srv libkrb5 \ libroken libsl libvers libkdc libwind libheimsqlite libheimbase libheimipcc libheimipcs +SUBDIR+= libkafs5 # requires krb_err.h from libkrb5 + .include diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 3d3326bd6175..6d66578cb247 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -24,9 +24,6 @@ MLINKS= kafs5.3 k_afs_cell_of_file.3 \ kafs5.3 krb_afslog_uid.3 SRCS= afssys.c afskrb5.c common.c krb5_err.h -SRCS= afssys.c \ - afskrb5.c \ - common.c CFLAGS+= -I${KRB5DIR}/lib/kafs \ -I${KRB5DIR}/lib/krb5 \