From owner-svn-src-all@freebsd.org Thu Apr 18 01:15:49 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 6289E157F74E; Thu, 18 Apr 2019 01:15:49 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-it1-f196.google.com (mail-it1-f196.google.com [209.85.166.196]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EBE366DD81; Thu, 18 Apr 2019 01:15:48 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-it1-f196.google.com with SMTP id y134so807689itc.5; Wed, 17 Apr 2019 18:15:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EDaAnmcYncE0b2BHECTYUFYLl/nial95/K3PF0ePBLw=; b=CeKbGxwb29XPI6Q5CjVSk4ADb8IpV4UULI/ij9+swdLPDTgKaZAfl6gjGVnnObQ3Hd e4qR3zr6byCPJERgi8aTKzo8RddkX5jeZYVb1cm3K+//SgDn+6d34vfruFnbRZNKxMbH 3+iXY/TJRYAEXZv/YbajZo+AYPXpcPJfK+p0D2oKpIVlx+FnQeucNs1U3Qk7xEeGTdQ6 Nl0nVI10Y6zCHJS70RD7MV2A7URnRZrFW5jYPDEd5jR/A6L6YLtl5v/HdAty+Placwip DaBBdjW2C0TkHJzBoaenv4uiFh8D34+1YQQOIU5hPtBeIO5ifq3mswtExR918x70n4Sl udqw== X-Gm-Message-State: APjAAAU6goA6O9rw+n11XBnBRZDd8LH0Y5yR9LmxDjnAhOeMbTo0nFZg 7/4ykVXRAbOUA/E1Aa/WV/yQQoDQ0ZdiK4vSTAQ= X-Google-Smtp-Source: APXvYqxA8ts/mcE/eKp/qM6nggYUOeCdhohRGQttm4vVgiL/JOBaXIqCM6UWV/PfbL/cokdeN7fg/12bUwDrz3X5MYE= X-Received: by 2002:a24:7354:: with SMTP id y81mr1237637itb.87.1555549650446; Wed, 17 Apr 2019 18:07:30 -0700 (PDT) MIME-Version: 1.0 References: <20190417195145.6824c0f9@thor.intern.walstatt.dynvpn.de> <201904171941.x3HJfmee090931@slippy.cwsent.com> In-Reply-To: From: Ed Maste Date: Wed, 17 Apr 2019 21:07:18 -0400 Message-ID: Subject: Re: svn commit: r346316 - in head: contrib/elftoolchain/strings sbin/savecore usr.bin/brandelf usr.bin/head usr.bin/wc To: Cy Schubert Cc: "O. Hartmann" , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: EBE366DD81 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] 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:15:49 -0000 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_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