On Thu, Aug 31, 2006 at 06:51:58AM +0100, Robert Watson wrote: > On Mon, 28 Aug 2006, Warner Losh wrote: > > >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. > > 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. > Quite the opposite I'd say. From libbsm/Makefile:
#
# Must use BSM include files from within the contrib area, not the system.
#
CFLAGS+= -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
<probably several others>
Cheers,
--
Ruslan Ermilov
[EMAIL PROTECTED]
FreeBSD committer
pgpNJhpmRMMLO.pgp
Description: PGP signature
