From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id C3331202BB for ; Thu, 7 Mar 2019 17:24:38 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; q=dns; s=default; b=Nv2Cg 8BePJIcpUwZj/p34wH81Oe/bBhpZsNbl07fwCbInPYmcjaYzuG5ktcmo5Wcmcq6/ jf2bObHxXn69kp3WmlFMBn2NbourIUo5YAv7iJ86yETgTpsPmi/nNtYqeEjPxAqa QVSeFi7ImV12RMyfiN1+dVVlamOTF8hJDiPTY8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=default; bh=JTlM1t68gnf usKgzxROm5TGzEYg=; b=jrTixyZYDLc8Sjc4bDV1qTjMzggoIADFFk6xdXi7G/z iJkbTrdOuo3clNZt5TzBe7FYWGTxXHypOLbggOceFl78HkXmBSTWb3mV4z/Fm0I/ ROpJTje4lK+yuEm7O3dqsI0yqcbnR9grS2oUxPzTqujL5N9owFZpRLGcWlCY9ySk = Received: (qmail 8826 invoked by alias); 7 Mar 2019 17:24:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 127217 invoked by uid 89); 7 Mar 2019 17:24:21 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mx1.redhat.com From: Florian Weimer To: Zack Weinberg Cc: GNU C Library Subject: Re: [PATCH COMMITTED] check-wrapper-headers test: Adjust Fortran include file directory References: <20190307163306.B3E8F81D9FFB@oldenburg2.str.redhat.com> Date: Thu, 07 Mar 2019 18:24:16 +0100 In-Reply-To: (Zack Weinberg's message of "Thu, 7 Mar 2019 12:17:24 -0500") Message-ID: <87wola7g3j.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain * Zack Weinberg: > On Thu, Mar 7, 2019 at 11:33 AM Florian Weimer wrote: >> >> The check for "/finclude/" fails with the actual location of >> Fortran headers because they are now stored in the "finclude" >> subdirectory of the top-level include directory, so a relative path >> does not contain a slash '/' before the "finclude" string. > > For future-proofing, the script should do both checks: > > if header.startswith("finclude/") or "/finclude/" in header: > > (I'm working on a patch series which, among other things, removes all > of the installed headers from the top-level include directory.) This is the relative installed path, relative to the include directory, which is put into the headers make variable. I expect that Fortran headers will live exclusively in /usr/include/finclude, which is why I'm not checking for finclude subdirectories. Thanks, Florian