svn commit: r346316 - in head: contrib/elftoolchain/strings sbin/savecore usr.bin/brandelf usr.bin/head usr.bin/wc

[Ed Maste]

On Wed, 17 Apr 2019 at 20:50, Ed Maste <emaste at freebsd.org> wrote:
>
> On Wed, 17 Apr 2019 at 15:42, Cy Schubert <Cy.Schubert at cschubert.com> wrote:
> >
> > -.if !exists(/usr/include/casper/cap_fileargs.h)
> >  CASPERINC+=    ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.
> > h
> > -.endif
>
> Yes I think this change is correct as an immediate workaround for this
> issue (until we sort out header bootstrapping in a more holistic way).
> Please commit it, or I will if you don't get to it soon.

Or maybe this, similar to the existing tests in tools/build/Makefile:

Index: tools/build/Makefile
===================================================================
--- tools/build/Makefile        (revision 346340)
+++ tools/build/Makefile        (working copy)
@@ -59,7 +59,10 @@
 INCS+=         libcasper.h
 .endif

-.if !exists(/usr/include/casper/cap_fileargs.h)
+.if exists(/usr/include/casper/cap_fileargs.h)
+_WITH_FA_OPEN!= grep -c FA_OPEN /usr/include/casper/cap_fileargs.h || true
+.endif
+.if !defined(_WITH_FA_OPEN) || ${_WITH_FA_OPEN} == 0
 CASPERINC+=    ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h
 .endif