From owner-svn-src-all@freebsd.org Thu Apr 18 01:17:32 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0212E157FA52; Thu, 18 Apr 2019 01:17:32 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id F17B56E138; Thu, 18 Apr 2019 01:17:30 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id Gvg7hVk4FGusjGvg9hGKGw; Wed, 17 Apr 2019 19:17:29 -0600 X-Authority-Analysis: v=2.3 cv=fOdHIqSe c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=oexKYjalfGEA:10 a=xfDLHkLGAAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=k8PgTzd3dCnHDGy2r_oA:9 a=CjuIK1q_8ugA:10 a=DoawHyg_QpkA:10 a=IfaqVvZgccqrtc8gcwf2:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy8 [10.2.2.6]) by spqr.komquats.com (Postfix) with ESMTPS id 248C2EC0; Wed, 17 Apr 2019 18:17:27 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x3I1H8wI065561; Wed, 17 Apr 2019 18:17:08 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id x3I1H70l065558; Wed, 17 Apr 2019 18:17:07 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201904180117.x3I1H70l065558@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ed Maste cc: Cy Schubert , "O. Hartmann" , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r346316 - in head: contrib/elftoolchain/strings sbin/savecore usr.bin/brandelf usr.bin/head usr.bin/wc In-Reply-To: Message from Ed Maste of "Wed, 17 Apr 2019 21:07:18 -0400." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 17 Apr 2019 18:17:07 -0700 X-CMAE-Envelope: MS4wfPu6zz9jw2PCA8Y3/uiOPzmFzrX0ET9q6JejXthFvT2o1Sr9KyVKrNp3H9V3WGYIOvQS/jVMWt5T98ml3ZaChbdrIskhpMR/0ueZZi4yhRxyKtPyNySV 97mnl4lbOqXxhYBtOmJjKmKTp/g7P3N7HT62XFDdTc707628I4kElp+ODxDbZHTwQDgb3nxHrmj9jrp6y1iFQq6jJmqpQoXjh3X24FN3QyF4NNcEFopyjqpk 9+ds6SYRlaMSRLjgb/RWcXLFVcx4AwBYwA2LrXLThSFfkFRhoOppATa++0t3QKo2iZgdLREMDIrhVEOWLyEiGDGsAvd/cyQ+zghC4Cejcdo= X-Rspamd-Queue-Id: F17B56E138 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-5.02 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; RCVD_IN_DNSWL_LOW(-0.10)[137.136.59.64.list.dnswl.org : 127.0.5.1]; FROM_HAS_DN(0.00)[]; MV_CASE(0.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCPT_COUNT_FIVE(0.00)[6]; REPLYTO_EQ_FROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-2.34)[ip: (-6.05), ipnet: 64.59.128.0/20(-3.15), asn: 6327(-2.41), country: CA(-0.09)]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Apr 2019 01:17:32 -0000 In message , Ed Maste writes: > On Wed, 17 Apr 2019 at 20:50, Ed Maste wrote: > > > > On Wed, 17 Apr 2019 at 15:42, Cy Schubert wrote > : > > > > > > -.if !exists(/usr/include/casper/cap_fileargs.h) > > > CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_filearg > s. > > > 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 This only tests for the FA_OPEN. It will miss any new macro definitions should there be any at some point in the future. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.