From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id D3BB13858022 for ; Sun, 13 Nov 2022 19:26:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D3BB13858022 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B39F11FADB; Sun, 13 Nov 2022 19:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1668367614; h=from:from:reply-to: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=MNfenl9t/N7yOn3TEaDF/+ZX6RoMub9W9i7wytWXgLA=; b=rQsH0VAhSs9CiaJOdfQi8vyPSzzZECyhI4R/j1FmvMJtsLm7NUGkuKXOj5bZrTFa2jfnr3 9MjcCGBkTenXQwXcpITj17VspCAEIUSbodPTEKZxBgmb9ZnkStxQDVy/WYLQB9T06yeoME 3SC3DZtI/q7OSAhxU9ayQUu5m84PyNg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1668367614; h=from:from:reply-to: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=MNfenl9t/N7yOn3TEaDF/+ZX6RoMub9W9i7wytWXgLA=; b=ksAGUoEbNeIOfZVsGarf784O/hE5jq7KMpxJ8nMRS5b3+miOVaRIuH/FubnQQcLNEa0pNg tIkpdHrulT4MaVDQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9CFB9133A4; Sun, 13 Nov 2022 19:26:54 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qFE1Jf5EcWNJDAAAMHmgww (envelope-from ); Sun, 13 Nov 2022 19:26:54 +0000 Message-ID: Date: Sun, 13 Nov 2022 20:26:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH (pushed)] sphinx: fix building if sphinx-build is missing Content-Language: en-US To: Stephan Bergmann Cc: gcc-patches@gcc.gnu.org References: <75c37723-6963-db1a-0eb3-d71e16aecd7b@suse.cz> <232c6b57-492e-d1a7-265b-07fcbb240b7a@redhat.com> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: <232c6b57-492e-d1a7-265b-07fcbb240b7a@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00,BODY_8BITS,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,SPF_HELO_NONE,SPF_SOFTFAIL,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/13/22 20:18, Stephan Bergmann wrote: > 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 I see! > > [...] >> 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 The patch is fine, please send it to gcc-patches ML and install it. Thanks, Martin > >> 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) >>   > >