From owner-svn-src-all@FreeBSD.ORG  Mon Dec 23 14:23:18 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 37785B55;
 Mon, 23 Dec 2013 14:23:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 235DA10DE;
 Mon, 23 Dec 2013 14:23:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNENIZL098229;
 Mon, 23 Dec 2013 14:23:18 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNENHNZ098227;
 Mon, 23 Dec 2013 14:23:17 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201312231423.rBNENHNZ098227@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Mon, 23 Dec 2013 14:23:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259769 - in head/kerberos5/lib: . libkafs5
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Dec 2013 14:23:18 -0000

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 \