Date: Wed, 17 Apr 2019 21:07:18 -0400 From: Ed Maste <emaste@freebsd.org> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: "O. Hartmann" <ohartmann@walstatt.org>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r346316 - in head: contrib/elftoolchain/strings sbin/savecore usr.bin/brandelf usr.bin/head usr.bin/wc Message-ID: <CAPyFy2CY-7O3JPaF4sshvcnAVH2dUfyePTPF5f8b022h7wpGxQ@mail.gmail.com> In-Reply-To: <CAPyFy2A24p9DjsQBfLo%2Bm8Eot6Rcj9H0RzY0OkVQiYd2Dzf6Kg@mail.gmail.com> References: <ohartmann@walstatt.org> <20190417195145.6824c0f9@thor.intern.walstatt.dynvpn.de> <201904171941.x3HJfmee090931@slippy.cwsent.com> <CAPyFy2A24p9DjsQBfLo%2Bm8Eot6Rcj9H0RzY0OkVQiYd2Dzf6Kg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 17 Apr 2019 at 20:50, Ed Maste <emaste@freebsd.org> wrote:
>
> On Wed, 17 Apr 2019 at 15:42, Cy Schubert <Cy.Schubert@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2CY-7O3JPaF4sshvcnAVH2dUfyePTPF5f8b022h7wpGxQ>