Author: uqs
Date: Mon Dec 23 14:23:17 2013
New Revision: 259769
URL: http://svnweb.freebsd.org/changeset/base/259769
Log:
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
Modified:
head/kerberos5/lib/Makefile
head/kerberos5/lib/libkafs5/Makefile
Modified: head/kerberos5/lib/Makefile
==============================================================================
--- head/kerberos5/lib/Makefile Mon Dec 23 11:48:22 2013 (r259768)
+++ head/kerberos5/lib/Makefile Mon Dec 23 14:23:17 2013 (r259769)
@@ -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 <bsd.subdir.mk>
Modified: head/kerberos5/lib/libkafs5/Makefile
==============================================================================
--- head/kerberos5/lib/libkafs5/Makefile Mon Dec 23 11:48:22 2013
(r259768)
+++ head/kerberos5/lib/libkafs5/Makefile Mon Dec 23 14:23:17 2013
(r259769)
@@ -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 \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
