From owner-cvs-all@FreeBSD.ORG Thu Aug 31 09:02:10 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 29C3716A4DF; Thu, 31 Aug 2006 09:02:10 +0000 (UTC) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (relay0.rambler.ru [81.19.66.187]) by mx1.FreeBSD.org (Postfix) with ESMTP id 349C343D5F; Thu, 31 Aug 2006 09:02:09 +0000 (GMT) (envelope-from ru@rambler-co.ru) Received: from relay0.rambler.ru (localhost [127.0.0.1]) by relay0.rambler.ru (Postfix) with ESMTP id 0F1AE61A3; Thu, 31 Aug 2006 13:02:08 +0400 (MSD) Received: from edoofus.park.rambler.ru (unknown [81.19.65.108]) by relay0.rambler.ru (Postfix) with ESMTP id E21246192; Thu, 31 Aug 2006 13:02:07 +0400 (MSD) Received: (from ru@localhost) by edoofus.park.rambler.ru (8.13.6/8.13.6) id k7V92Ysp052536; Thu, 31 Aug 2006 13:02:34 +0400 (MSD) (envelope-from ru) Date: Thu, 31 Aug 2006 13:02:34 +0400 From: Ruslan Ermilov To: Robert Watson Message-ID: <20060831090234.GG14958@rambler-co.ru> References: <200608281726.k7SHQdhJ045742@repoman.freebsd.org> <20060831064831.K81771@fledge.watson.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="doKZ0ri6bHmN2Q5y" Content-Disposition: inline In-Reply-To: <20060831064831.K81771@fledge.watson.org> User-Agent: Mutt/1.5.12-2006-07-14 X-Virus-Scanned: No virus found Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, Warner Losh , 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 09:02:10 -0000 --doKZ0ri6bHmN2Q5y Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 31, 2006 at 06:51:58AM +0100, Robert Watson wrote: > On Mon, 28 Aug 2006, Warner Losh wrote: >=20 > >imp 2006-08-28 17:26:39 UTC > > > > FreeBSD src repository > > > > src/contrib/openbsm - Imported sources > > Update of /home/ncvs/src/contrib/openbsm > > In directory repoman.freebsd.org:/tmp/cvs-serv45632 > > > > Log Message: > > 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. >=20 > The audit_record.h file in src/contrib/openbsm/bsm is not used in buildin= g=20 > FreeBSD; instead, src/sys/bsm is used. If audit_record.h is being used= =20 > from the contrib tree, there is a problem with the build parts. Looking = at=20 > the BSD makefiles associated with libbsm, I'm not sure I see how that can= =20 > happen. >=20 Quite the opposite I'd say. From libbsm/Makefile: # # Must use BSM include files from within the contrib area, not the system. # CFLAGS+=3D -I${OPENBSMDIR} -I${LIBBSMDIR} -I${.CURDIR}/../../sys ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^ I.e., the contrib one comes first. It's in the amd64 lib32 build that the version from sys/ gets used, due to a minor bug (what an irony) in the 32-bit build subsystem. It's the sys/ header was broken. You can easily verify it yourself by checking the contents of .depend files in the obj tree. Like I said in another email, if you want the sys/ version to always be used, "cvs rm -f src/contrib/openbsm/bsm/audit_record.h" and any other similar headers because apparently -I${OPENBSMDIR} is needed. If you will be able to build without -I${OPENBSMDIR}, then no contrib/ header need to be removed on HEAD. I don't think this is actually possible, since it needs the following not otherwise installed contrib/ headers: config/config.h compat/queue.h bsm/audit_internal.h Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --doKZ0ri6bHmN2Q5y Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (FreeBSD) iD8DBQFE9qWqqRfpzJluFF4RAv60AJ9PwepxNcc04dDcOdTyRTFesSHE5QCcCNY3 I8v0izZUa8uv0Mu7vzGNLcU= =rui/ -----END PGP SIGNATURE----- --doKZ0ri6bHmN2Q5y--