From owner-cvs-all@FreeBSD.ORG Thu Aug 31 06:14:32 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B43B416A4DE; Thu, 31 Aug 2006 06:14:32 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 607F743D46; Thu, 31 Aug 2006 06:14:32 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id BC7AC46CB5; Thu, 31 Aug 2006 02:14:31 -0400 (EDT) Date: Thu, 31 Aug 2006 07:14:31 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Warner Losh In-Reply-To: <20060831064831.K81771@fledge.watson.org> Message-ID: <20060831071050.K81771@fledge.watson.org> References: <200608281726.k7SHQdhJ045742@repoman.freebsd.org> <20060831064831.K81771@fledge.watson.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/contrib/openbsm - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Aug 2006 06:14:32 -0000 On Thu, 31 Aug 2006, Robert Watson wrote: > On Mon, 28 Aug 2006, Warner Losh wrote: > >> Import on vendor branch two files that have been tweaked to unbreak >> the build. The openbsm folks are free to fix it in any other way they >> see fit once they resurface. >> >> Basically, make everything always be const char **, even though const >> char ** usually should be 'const char * const *' in most cases. This >> makes the three different definitions consistant and allows world to >> build. > > The audit_record.h file in src/contrib/openbsm/bsm is not used in building > FreeBSD; instead, src/sys/bsm is used. If audit_record.h is being used from > the contrib tree, there is a problem with the build parts. Looking at the > BSD makefiles associated with libbsm, I'm not sure I see how that can > happen. > > Notice that world builds on all platforms but amd64, and that the build > failure is not an amd64-specific warning/error in the compile: it has to do > with matching prototypes, not with pointer/int size, format strings, etc. > I'm not convinced OpenBSM is at fault here, although clearly it's triggered > by the OpenBSM import. Just as a follow-up to this thread for the more general benefit, as portions went offline: it looks like the problem is that the compat32 support on the amd64 platform is using different include paths or include installs than is used for non-compat32 builds, resulting in libbsm under compat32 using the wrong include file (in contrib). Since the contrib one differs from the base system one, due to some changes not yet merged to the FreeBSD kernel in the base system, it conflicts with src/sys/bsm, which contains the include files intended to be built as part of the base system. I'm a little surprised that your change allows the base to continue to build, given that your "fix" didn't change src/sys/bsm, only the contrib tree. So it sounds like we need to fix the compat32 build environment before your build fixes can be reverted. Robert N M Watson Computer Laboratory University of Cambridge