From owner-svn-src-head@freebsd.org Tue Sep 3 14:07:23 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 823DDDD407; Tue, 3 Sep 2019 14:07:04 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N8081MKmz4QCq; Tue, 3 Sep 2019 14:07:04 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 9F5B71B04D; Tue, 3 Sep 2019 14:06:27 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id CF1AC6F80; Thu, 18 Apr 2019 14:22:58 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 58AF6680FE; Thu, 18 Apr 2019 14:22:58 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 10B206F49; Thu, 18 Apr 2019 14:22:58 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id B974F6F43 for ; Thu, 18 Apr 2019 14:22:55 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 623D5680F6; Thu, 18 Apr 2019 14:22:55 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x3IEMrIi005931; Thu, 18 Apr 2019 07:22:53 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x3IEMrux005930; Thu, 18 Apr 2019 07:22:53 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201904181422.x3IEMrux005930@gndrsh.dnsmgr.net> Subject: Re: svn commit: r346341 - head/tools/build In-Reply-To: To: Kyle Evans CC: "Rodney W. Grimes" , Cy Schubert , Cy Schubert , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 58AF6680FE X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:07:24 -0000 X-Original-Date: Thu, 18 Apr 2019 07:22:53 -0700 (PDT) X-List-Received-Date: Tue, 03 Sep 2019 14:07:24 -0000 > On Thu, Apr 18, 2019 at 8:46 AM Rodney W. Grimes > wrote: > > > > > In message <201904180107.x3I17QDc002945@gndrsh.dnsmgr.net>, "Rodney W. > > > Grimes" > > > writes: > > > > > Author: cy > > > > > Date: Thu Apr 18 01:02:00 2019 > > > > > New Revision: 346341 > > > > > URL: https://svnweb.freebsd.org/changeset/base/346341 > > > > > > > > > > Log: > > > > > As an interim measure until a more permanent solution is implemented > > > > > workaround the following error: > > > > > > > > > > /usr/src/contrib/elftoolchain/strings/strings.c:198:55: error: use of > > > > > undeclared identifier > > > > > 'FA_OPEN' fa = fileargs_init(argc, argv, O_RDONLY, 0, &rights, FA_OPEN); > > > > > > > > > > Reported by: O. Hartmann > > > > > Reported by: Michael Butler > > > > > Reported by: gjb@ & cy@ (implicit) > > > > > Reviewed by: emaste@ > > > > > Noted by: rgrimes@ > > > > > > > > > > Modified: > > > > > head/tools/build/Makefile > > > > > > > > > > Modified: head/tools/build/Makefile > > > > > =========================================================================== > > > > === > > > > > --- head/tools/build/Makefile Thu Apr 18 00:38:54 2019 (r34634 > > > > 0) > > > > > +++ head/tools/build/Makefile Thu Apr 18 01:02:00 2019 (r34634 > > > > 1) > > > > > @@ -59,9 +59,7 @@ INCS+= capsicum_helpers.h > > > > > INCS+= libcasper.h > > > > > .endif > > > > > > > > > > -.if !exists(/usr/include/casper/cap_fileargs.h) > > > > > CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_filea > > > > rgs.h > > > > > -.endif > > > > > > > > As a further note, we should probably hunt for any thing > > > > that is explicity looking at /usr/include/... in a Makefile, > > > > as that is minimally missing a ${DESTDIR} argument. > > > > > > > > The above may of actually worked if it had been written: > > > > .if !exists(${DESTDIR}/usr/include/casper/cap_fileargs.h) > > > > someone may wish to test that. > > > > > > > > Also a pathname rooted at / without ${DESTDIR} is almost certainly a mistake. > > > > > > This is a better solution. I tested this in a tree with a duplicated > > > environment: Problem solved. Before this is committed it should be > > > tested on one of the universe machines. > > > > From what Ed just said this would also be wrong, > > as well as CASPERINC+= above being wrong, if this > > is being built for the host we should not be using > > any headers from ${SRCTOP} at all. > > > > if capfileargs.h does not exist on the host that functionality > > must not be compiled into the buildtool as the host does not > > have this feature and attempting to use it from SRCTOP is wrong. > > > > Keep in mind that this is bootstrap; it's being built for the host > system, but it will link against a version of libcasper that's been > built in an earlier stage with the proper featureset. Ok, flip flop again, if infact this is linked against a library that implements the stuff from cap_fileargs.h then infact the ${DESTDIR} addition so that the build peaks into the cross build tree is correct, or what ever the equivelent to DESTDIR is for that ? BUILDDIR? The point is it should be picking this header up from the object tree, NOT from the running system. -- Rod Grimes rgrimes@freebsd.org