From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id DE80D3858289 for ; Sun, 13 Nov 2022 19:18:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DE80D3858289 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668367127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yj+8DFU037rLJazHr46iJNfiMVHfhlMuS6iURrleZTU=; b=HEx+R5b6Y9aU5aG9OFJwns7c9x1mnysIK2m2ENft+7Rv2WDosUOYohw7u3IGq8Tj0Ik0Ge QOA1mK6idQ6ir/fsPgy3J+vr73QMOELTbvHWfqQRLeZ7ddY/X/0YkuGxMCD6fOUDP71ITu l+6u5Bd6qTkEKtq3dgUDejrnAMSa96M= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-394-sHG3sagVMr2wrHC3vDcNIQ-1; Sun, 13 Nov 2022 14:18:45 -0500 X-MC-Unique: sHG3sagVMr2wrHC3vDcNIQ-1 Received: by mail-ed1-f71.google.com with SMTP id f20-20020a0564021e9400b00461ea0ce17cso6863769edf.16 for ; Sun, 13 Nov 2022 11:18:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yj+8DFU037rLJazHr46iJNfiMVHfhlMuS6iURrleZTU=; b=heBM30IPVPGRLZhhDKQLpyv8hhPidQHNHyV/3AAKieIo3E0gQancJPtTAS2uLNAWYL ZdCX5XR3mtULnHlRn6+GaWnHJpLSe94ho9t7qFdssQlUhDxRH6p2a79ibrumYz95o/d7 a1e0mu1q18dLbkKLw+QvI1Fm2R1BKEzSj0gTvJRRqFEXxAvpQB2PSFf3igbbn+JQVipU zFvHw+NvQMpyL5hHg8sZqVaAURmzqYZDR3WxGCg+44EFBndi3SiZScC2OUlVR6TTsRzd tju5fPorLoa8djTEvgdHG1S5P/5PuP1h9TU1dnVHnh0xSourdx8WcBgwX3U5g0/McFf+ sOcA== X-Gm-Message-State: ANoB5plgx6HcWpBES5XRVniqYFW8C3264RhU3GwQABMrpPu3sRXBdigZ 8TBD1opp7f1lU6X8eiE/z31iBNHMiXwosQw1Asa+JeWzKEtHL26Gv+nAfBkrpg3WoFGTJ0qFVbY s2dSFptI0GhW+8hyTCQ== X-Received: by 2002:a17:906:a1c6:b0:7ad:d250:b907 with SMTP id bx6-20020a170906a1c600b007add250b907mr7889495ejb.737.1668367124138; Sun, 13 Nov 2022 11:18:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf6f3vHqA3M1ecu5lLzLMTdJ39Q21+4TmLlE+xrise5LWWQEoT4ERu5hm7Sru2kfVWRcGdqj9A== X-Received: by 2002:a17:906:a1c6:b0:7ad:d250:b907 with SMTP id bx6-20020a170906a1c600b007add250b907mr7889489ejb.737.1668367123782; Sun, 13 Nov 2022 11:18:43 -0800 (PST) Received: from [192.168.178.30] (i59F6C4A8.versanet.de. [89.246.196.168]) by smtp.gmail.com with ESMTPSA id n4-20020aa7c784000000b00463b9d47e1fsm3791352eds.71.2022.11.13.11.18.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Nov 2022 11:18:42 -0800 (PST) Message-ID: <232c6b57-492e-d1a7-265b-07fcbb240b7a@redhat.com> Date: Sun, 13 Nov 2022 20:18:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH (pushed)] sphinx: fix building if sphinx-build is missing To: =?UTF-8?Q?Martin_Li=c5=a1ka?= Cc: gcc-patches@gcc.gnu.org References: <75c37723-6963-db1a-0eb3-d71e16aecd7b@suse.cz> From: Stephan Bergmann In-Reply-To: <75c37723-6963-db1a-0eb3-d71e16aecd7b@suse.cz> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_BARRACUDACENTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 11/9/22 10:09, Martin Liška wrote: > I noticed I modified Makefile.in files in the Sphinx series. While I was > supposed to modifiky Makefile.am and use automake. I'm going to fix that soon. A recent master build against (apparently too old) python3-sphinx-5.0.2-2.fc37.noarch failed for me with [...] > make -C ../../src/gcc/../doc man SOURCEDIR=.../build/gcc/../../src/gcc/fortran/doc/gfortran BUILDDIR=.../build/gcc/doc/gfortran/man SPHINXBUILD=sphinx-build > make[3]: Entering directory '.../src/doc' > sphinx-build -b "man" -d .../build/gcc/doc/gfortran/man/doctrees -q .../build/gcc/../../src/gcc/fortran/doc/gfortran ".../build/gcc/doc/gfortran/man/man" > > Sphinx version error: > This project needs at least Sphinx v5.3 and therefore cannot be built with this version. > make[3]: *** [Makefile:100: man] Error 2 > make[3]: Leaving directory '.../src/doc' > make[2]: *** [../../src/gcc/fortran/Make-lang.in:164: doc/gfortran/man/man/gfortran.1] Error 2 > make[2]: Leaving directory '.../build/gcc' > make[1]: *** [Makefile:5300: install-gcc] Error 2 > make[1]: Leaving directory '.../build' > make: *** [Makefile:2576: install] Error 2 which would be fixed by > diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in > index 48acbed1754..852b6f3327f 100644 > --- a/gcc/fortran/Make-lang.in > +++ b/gcc/fortran/Make-lang.in > @@ -161,7 +161,9 @@ fortran.install-pdf: $(F95_PDFFILES) > F95_MANFILES = doc/gfortran/man/man/gfortran.1 > > doc/gfortran/man/man/gfortran.1: $(SPHINX_FILES) > - + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/gfortran/man SPHINXBUILD=$(SPHINX_BUILD) > + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ > + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/gfortran/man SPHINXBUILD=$(SPHINX_BUILD) \ > + else true; fi > > fortran.man: $(F95_MANFILES) >