Re: WITHOUT_CASPER not working anymore ? Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump
On Jan 23, 2015, at 20:52, Luigi Rizzo wrote: > Not that i mind if it is intentional (though it seems not), but after this > commit tcpdump does not build anymore with -DWITHOUT_CASPER. > > To be precise, the failure is when you do a buildworld with WITHOUT_CASPER, > which does not install the libcapsicum headers. > > I understand that there is a change in the macro that defines support > (from HAVE_LIBCAPSICUM to HAVE_CAPSICUM), but it seems to me > that in the chunk below (for tcpdump.c, but other sources are affected too) > the #ifdef HAVE_CAPSICUM / #endif block contains headers > that are totally unrelated to capsicum: > you should probably protect the headers. > > > @@ -70,25 +76,24 @@ > #include > #ifdef __FreeBSD__ > #include > -#include > -#include > #include > -#include > -#include > -#include > -#ifdef HAVE_LIBCAPSICUM > #include > #include > #include > #include > -#endif /* HAVE_LIBCAPSICUM */ > -#endif /* __FreeBSD__ */ > +#endif /* __FreeBSD__ */ > +#ifdef HAVE_CAPSICUM > +#include > +#include > +#include > +#include > +#include > +#endif /* HAVE_CAPSICUM */ > #ifndef WIN32 > #include > #include > #include > #include > -#include > #endif /* WIN32 */ > > /* capabilities convinience library */ > > I am happy to send a patch but would be more comfortable if you could > review/deal with it yourself. Someone else reported this too on the mailing lists... signature.asc Description: Message signed with OpenPGP using GPGMail
WITHOUT_CASPER not working anymore ? Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump
Not that i mind if it is intentional (though it seems not), but after this commit tcpdump does not build anymore with -DWITHOUT_CASPER. To be precise, the failure is when you do a buildworld with WITHOUT_CASPER, which does not install the libcapsicum headers. I understand that there is a change in the macro that defines support (from HAVE_LIBCAPSICUM to HAVE_CAPSICUM), but it seems to me that in the chunk below (for tcpdump.c, but other sources are affected too) the #ifdef HAVE_CAPSICUM / #endif block contains headers that are totally unrelated to capsicum: you should probably protect the headers. @@ -70,25 +76,24 @@ #include #ifdef __FreeBSD__ #include -#include -#include #include -#include -#include -#include -#ifdef HAVE_LIBCAPSICUM #include #include #include #include -#endif /* HAVE_LIBCAPSICUM */ -#endif /* __FreeBSD__ */ +#endif /* __FreeBSD__ */ +#ifdef HAVE_CAPSICUM +#include +#include +#include +#include +#include +#endif /* HAVE_CAPSICUM */ #ifndef WIN32 #include #include #include #include -#include #endif /* WIN32 */ /* capabilities convinience library */ I am happy to send a patch but would be more comfortable if you could review/deal with it yourself. cheers luigi On Wed, Jan 7, 2015 at 11:55 AM, Xin LI wrote: > Author: delphij > Date: Wed Jan 7 19:55:18 2015 > New Revision: 276788 > URL: https://svnweb.freebsd.org/changeset/base/276788 > > Log: > MFV r276761: tcpdump 4.6.2. ___ 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"
