public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Stephan Bergmann <sbergman@redhat.com>
To: "Martin Liška" <mliska@suse.cz>
Cc: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH (pushed)] sphinx: fix building if sphinx-build is missing
Date: Sun, 13 Nov 2022 20:18:41 +0100	[thread overview]
Message-ID: <232c6b57-492e-d1a7-265b-07fcbb240b7a@redhat.com> (raw)
In-Reply-To: <75c37723-6963-db1a-0eb3-d71e16aecd7b@suse.cz>

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)
>  



  reply	other threads:[~2022-11-13 19:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-09  9:09 Martin Liška
2022-11-13 19:18 ` Stephan Bergmann [this message]
2022-11-13 19:26   ` Martin Liška
2022-11-13 21:19     ` Stephan Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=232c6b57-492e-d1a7-265b-07fcbb240b7a@redhat.com \
    --to=sbergman@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=mliska@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).