public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc(refs/users/marxin/heads/sphinx-v7)] Add --with-sphinx-build
Date: Wed, 27 Jul 2022 14:48:12 +0000 (GMT) [thread overview]
Message-ID: <20220727144812.4DA10385AE5B@sourceware.org> (raw)
https://gcc.gnu.org/g:ebff1d1d06a3542c336f307fa54279127aea58c5
commit ebff1d1d06a3542c336f307fa54279127aea58c5
Author: Martin Liska <mliska@suse.cz>
Date: Wed Jul 27 15:40:48 2022 +0200
Add --with-sphinx-build
Diff:
---
gcc/Makefile.in | 34 +++++++++++++++++-----------------
gcc/ada/gcc-interface/Make-lang.in | 18 +++++++++---------
gcc/configure | 34 ++++++++++++++++++++++++++++++----
gcc/configure.ac | 24 ++++++++++++++++++++++--
gcc/d/Make-lang.in | 8 ++++----
gcc/fortran/Make-lang.in | 14 +++++++-------
gcc/go/Make-lang.in | 8 ++++----
gcc/jit/Make-lang.in | 12 ++++++------
libgomp/Makefile.in | 6 +++---
libiberty/Makefile.in | 6 +++---
libitm/Makefile.in | 6 +++---
libquadmath/Makefile.in | 6 +++---
12 files changed, 111 insertions(+), 65 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 39d14684969..b5b85d8a997 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3295,19 +3295,19 @@ PDFFILES = doc/gcc/pdf/latex/gcc.pdf doc/gccint/pdf/latex/gccint.pdf doc/install
pdf:: $(PDFFILES) lang.pdf
doc/gcc/pdf/latex/gcc.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/gccint/pdf/latex/gccint.pdf: $(SPHINX_FILES) s-tm-rst-in
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/install/pdf/latex/install.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/cpp/pdf/latex/cpp.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/cppinternals/pdf/latex/cppinternals.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/pdf SPHINXBUILD=$(SPHINX_BUILD)
# List the directories or single hmtl files which are installed by
# install-html. The lang.html file triggers language fragments to build
@@ -3323,19 +3323,19 @@ HTMLS = doc/gcc/html/html/index.html doc/gccint/html/html/index.html doc/install
html:: $(HTMLS) lang.html
doc/gcc/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/html SPHINXBUILD=$(SPHINX_BUILD)
doc/gccint/html/html/index.html: $(SPHINX_FILES) s-tm-rst-in
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/html SPHINXBUILD=$(SPHINX_BUILD)
doc/install/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/html SPHINXBUILD=$(SPHINX_BUILD)
doc/cpp/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/html SPHINXBUILD=$(SPHINX_BUILD)
doc/cppinternals/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/html SPHINXBUILD=$(SPHINX_BUILD)
MANFILES = doc/gcc/man/man/gcc.1 doc/cpp/man/man/cpp.1 \
doc/gcc/man/man/gfdl.7 doc/gcc/man/man/gpl.7 \
@@ -3359,7 +3359,7 @@ SPHINX_CONFIG_FILES:=$(shell find $(srcdir)/.. -name conf.py) $(srcdir)/../doc/b
SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
doc/gcc/man/man/gcc.1: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/man
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/man SPHINXBUILD=$(SPHINX_BUILD)
doc/gcc/man/man/gcov.1: doc/gcc/man/man/gcc.1
doc/gcc/man/man/gcov-tool.1: doc/gcc/man/man/gcc.1
@@ -3370,22 +3370,22 @@ doc/gcc/man/man/gpl.7: doc/gcc/man/man/gcc.1
doc/gcc/man/man/fsf-funding.7: doc/gcc/man/man/gcc.1
doc/cpp/man/man/cpp.1: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/man
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/man SPHINXBUILD=$(SPHINX_BUILD)
doc/gcc/info/texinfo/gcc.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/gcc BUILDDIR=$(objdir)/doc/gcc/info SPHINXBUILD=$(SPHINX_BUILD)
doc/gccint/info/texinfo/gccint.info: $(SPHINX_FILES) s-tm-rst-in
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/gccint BUILDDIR=$(objdir)/doc/gccint/info SPHINXBUILD=$(SPHINX_BUILD)
doc/cpp/info/texinfo/cpp.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/cpp BUILDDIR=$(objdir)/doc/cpp/info SPHINXBUILD=$(SPHINX_BUILD)
doc/cppinternals/info/texinfo/cppinternals.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/cppinternals BUILDDIR=$(objdir)/doc/cppinternals/info SPHINXBUILD=$(SPHINX_BUILD)
doc/install/info/texinfo/install.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir)/install BUILDDIR=$(objdir)/doc/install/info SPHINXBUILD=$(SPHINX_BUILD)
#\f
# Deletion of files made during compilation.
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index f91b8c63a60..0d5f5ca4324 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -810,17 +810,17 @@ ada.tags: force
doc/gnat_ugn/info/texinfo/gnat_ugn.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_ugn BUILDDIR=$(objdir)/doc/gnat_ugn/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_ugn BUILDDIR=$(objdir)/doc/gnat_ugn/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
doc/gnat_rm/info/texinfo/gnat_rm.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_rm BUILDDIR=$(objdir)/doc/gnat_rm/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_rm BUILDDIR=$(objdir)/doc/gnat_rm/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
doc/gnat-style/info/texinfo/gnat-style.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/ada/doc/gnat-style BUILDDIR=$(objdir)/doc/gnat-style/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/ada/doc/gnat-style BUILDDIR=$(objdir)/doc/gnat-style/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
ADA_INFOFILES = doc/gnat_ugn/info/texinfo/gnat_ugn.info \
@@ -855,13 +855,13 @@ ADA_PDFFILES = doc/gnat_ugn/pdf/latex/gnat_ugn.pdf\
ada.pdf: $(ADA_PDFFILES)
doc/gnat_ugn/pdf/latex/gnat_ugn.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_ugn BUILDDIR=$(objdir)/doc/gnat_ugn/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_ugn BUILDDIR=$(objdir)/doc/gnat_ugn/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/gnat_rm/pdf/latex/gnat_rm.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_rm BUILDDIR=$(objdir)/doc/gnat_rm/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_rm BUILDDIR=$(objdir)/doc/gnat_rm/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/gnat-style/pdf/latex/gnat-style.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/ada/doc/gnat-style BUILDDIR=$(objdir)/doc/gnat-style/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/ada/doc/gnat-style BUILDDIR=$(objdir)/doc/gnat-style/pdf SPHINXBUILD=$(SPHINX_BUILD)
ada.install-pdf: $(ADA_PDFFILES)
@$(NORMAL_INSTALL)
@@ -876,13 +876,13 @@ ada.install-pdf: $(ADA_PDFFILES)
ada.html: doc/gnat_ugn/html/html/index.html doc/gnat_rm/html/html/index.html doc/gnat-style/html/html/index.html
doc/gnat_ugn/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_ugn BUILDDIR=$(objdir)/doc/gnat_ugn/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_ugn BUILDDIR=$(objdir)/doc/gnat_ugn/html SPHINXBUILD=$(SPHINX_BUILD)
doc/gnat_rm/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_rm BUILDDIR=$(objdir)/doc/gnat_rm/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/ada/doc/gnat_rm BUILDDIR=$(objdir)/doc/gnat_rm/html SPHINXBUILD=$(SPHINX_BUILD)
doc/gnat-style/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/ada/doc/gnat-style BUILDDIR=$(objdir)/doc/gnat-style/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/ada/doc/gnat-style BUILDDIR=$(objdir)/doc/gnat-style/html SPHINXBUILD=$(SPHINX_BUILD)
ada.install-html:
diff --git a/gcc/configure b/gcc/configure
index 931747a8196..7c7f31684a5 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -808,6 +808,7 @@ NM
BISON
FLEX
SPHINX_BUILD
+CONFIGURE_SPHINX_BUILD
GENERATED_MANPAGES
BUILD_INFO
MAKEINFO
@@ -982,6 +983,7 @@ with_changes_root_url
enable_languages
with_multilib_list
with_multilib_generator
+with_sphinx_build
with_zstd
with_zstd_include
with_zstd_lib
@@ -1836,6 +1838,7 @@ Optional Packages:
SH and x86-64 only)
--with-multilib-generator
Multi-libs configuration string (RISC-V only)
+ --with-sphinx-build= Use sphinx-build from a given path
--with-zstd=PATH specify prefix directory for installed zstd library.
Equivalent to --with-zstd-include=PATH/include plus
--with-zstd-lib=PATH/lib
@@ -8807,12 +8810,33 @@ $as_echo "no" >&6; }
fi
+
+# Check whether --with-sphinx-build was given.
+if test "${with_sphinx_build+set}" = set; then :
+ withval=$with_sphinx_build; CONFIGURE_SPHINX_BUILD=$withval
+else
+ CONFIGURE_SPHINX_BUILD=
+
+fi
+
+
+
# See if sphinx-build has been installed and is modern enough
# that we can use it.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sphinx-build" >&5
$as_echo_n "checking for sphinx-build... " >&6; }
-if sphinx-build -j auto -h &>/dev/null ; then
- SPHINX_BUILD=sphinx-build
+sphinx=sphinx-build
+if test x${CONFIGURE_SPHINX_BUILD} != x ; then
+ sphinx=${CONFIGURE_SPHINX_BUILD}
+fi
+
+tempdir=build.$$
+source=source.$$
+mkdir $source
+grep 'needs_sphinx =' ${srcdir}/../doc/baseconf.py > $source/conf.py
+touch $source/index.rst
+if ${sphinx} $source $tempdir >/dev/null 2>&1; then
+ SPHINX_BUILD=${sphinx}
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
@@ -8826,6 +8850,8 @@ $as_echo "$as_me: WARNING:
$as_echo "no" >&6; }
SPHINX_BUILD=
fi
+rm -rf $tempdir
+rm -rf $source
MISSING="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing"
@@ -19696,7 +19722,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 19699 "configure"
+#line 19725 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19802,7 +19828,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 19805 "configure"
+#line 19831 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4f77c5ee859..efc141cc980 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1259,11 +1259,29 @@ else
fi
AC_SUBST(GENERATED_MANPAGES)
+AC_ARG_WITH(sphinx-build,
+ [AS_HELP_STRING([--with-sphinx-build=],
+ [Use sphinx-build from a given path])],
+ [CONFIGURE_SPHINX_BUILD=$withval],
+ [CONFIGURE_SPHINX_BUILD=]
+)
+AC_SUBST(CONFIGURE_SPHINX_BUILD)
+
# See if sphinx-build has been installed and is modern enough
# that we can use it.
AC_MSG_CHECKING([for sphinx-build])
-if sphinx-build -j auto -h &>/dev/null ; then
- SPHINX_BUILD=sphinx-build
+sphinx=sphinx-build
+if test x${CONFIGURE_SPHINX_BUILD} != x ; then
+ sphinx=${CONFIGURE_SPHINX_BUILD}
+fi
+
+tempdir=build.$$
+source=source.$$
+mkdir $source
+grep 'needs_sphinx =' ${srcdir}/../doc/baseconf.py > $source/conf.py
+touch $source/index.rst
+if ${sphinx} $source $tempdir >/dev/null 2>&1; then
+ SPHINX_BUILD=${sphinx}
AC_MSG_RESULT(yes)
else
AC_MSG_WARN([
@@ -1272,6 +1290,8 @@ else
AC_MSG_RESULT(no)
SPHINX_BUILD=
fi
+rm -rf $tempdir
+rm -rf $source
AC_SUBST(SPHINX_BUILD)
MISSING="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing"
diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in
index 87178e37145..17acadaa4f4 100644
--- a/gcc/d/Make-lang.in
+++ b/gcc/d/Make-lang.in
@@ -238,14 +238,14 @@ d21$(exeext): $(D_ALL_OBJS) attribs.o $(BACKEND) $(LIBDEPS) $(d.prev)
# Documentation.
doc/gdc/info/texinfo/gdc.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
doc/gdc.pdf: $(D_TEXI_FILES)
$(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
doc/gdc/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/html SPHINXBUILD=$(SPHINX_BUILD)
# Build hooks.
d.all.cross: gdc-cross$(exeext)
@@ -271,7 +271,7 @@ d.srcman: doc/gdc/man/man/gdc.1
-cp -p $^ $(srcdir)/doc
doc/gdc/man/man/gdc.1: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/man
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/man SPHINXBUILD=$(SPHINX_BUILD)
# 'make check' in gcc/ looks for check-d, as do all toplevel D-related
# check targets. However, our DejaGNU framework requires 'check-gdc' as its
@@ -304,7 +304,7 @@ d.install-plugin:
d.install-info: $(DESTDIR)$(infodir)/gdc.info
doc/gdc/pdf/latex/gdc.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/d/doc BUILDDIR=$(objdir)/doc/gdc/pdf SPHINXBUILD=$(SPHINX_BUILD)
$(DESTDIR)$(infodir)/gdc.info: doc/gdc/info/texinfo/gdc.info installdirs
-rm -f $@
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index df8099608bd..ea9bc24c2db 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -120,7 +120,7 @@ fortran.info: doc/fortran/info/texinfo/gfortran.info doc/gfc-internals/info/texi
doc/fortran/info/texinfo/gfortran.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
F95_HTMLFILES = doc/fortran/html/html/index.html
@@ -161,7 +161,7 @@ fortran.install-pdf: $(F95_PDFFILES)
F95_MANFILES = doc/fortran/man/man/gfortran.1
doc/fortran/man/man/gfortran.1: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/man
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/man SPHINXBUILD=$(SPHINX_BUILD)
fortran.man: $(F95_MANFILES)
@@ -183,22 +183,22 @@ check_gfortran_parallelize = 10000
selftest-fortran:
doc/fortran/pdf/latex/gfortran.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/fortran/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/fortran/doc/gfortran BUILDDIR=$(objdir)/doc/fortran/html SPHINXBUILD=$(SPHINX_BUILD)
# GFORTRAN internals documentation.
doc/gfc-internals/info/texinfo/gfc-internals.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
doc/gfc-internals/pdf/latex/gfc-internals.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/gfc-internals/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/fortran/doc/gfc-internals BUILDDIR=$(objdir)/doc/gfc-internals/html SPHINXBUILD=$(SPHINX_BUILD)
# Create or recreate the gfortran private include file directory.
install-finclude-dir: installdirs
diff --git a/gcc/go/Make-lang.in b/gcc/go/Make-lang.in
index e5de16f8580..b303371030e 100644
--- a/gcc/go/Make-lang.in
+++ b/gcc/go/Make-lang.in
@@ -90,14 +90,14 @@ go1$(exeext): $(GO_OBJS) attribs.o $(BACKEND) $(LIBDEPS) $(go.prev)
doc/gccgo/info/texinfo/gccgo.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/go/doc/ BUILDDIR=$(objdir)/doc/gccgo/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/go/doc/ BUILDDIR=$(objdir)/doc/gccgo/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
doc/gccgo/pdf/latex/gccgo.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/go/doc/ BUILDDIR=$(objdir)/doc/gccgo/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/go/doc/ BUILDDIR=$(objdir)/doc/gccgo/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/gccgo/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/go/doc/ BUILDDIR=$(objdir)/doc/gccgo/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/go/doc/ BUILDDIR=$(objdir)/doc/gccgo/html SPHINXBUILD=$(SPHINX_BUILD)
# Build hooks.
@@ -126,7 +126,7 @@ go.srcman: doc/gccgo/man/man/gccgo.1
-cp -p $^ $(srcdir)/doc
doc/gccgo/man/man/gccgo.1: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/go/doc BUILDDIR=$(objdir)/doc/gccgo/man
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/go/doc BUILDDIR=$(objdir)/doc/gccgo/man SPHINXBUILD=$(SPHINX_BUILD)
lang_checks += check-go
lang_checks_parallelized += check-go
diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
index a9aee905f2c..c06489208de 100644
--- a/gcc/jit/Make-lang.in
+++ b/gcc/jit/Make-lang.in
@@ -245,7 +245,7 @@ jit.info: doc/libgccjit/info/texinfo/libgccjit.info
doc/libgccjit/info/texinfo/libgccjit.info: $(SPHINX_FILES)
+ if [ x$(SPHINX_BUILD) = xsphinx-build ]; then \
- make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/info; \
+ make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/info; \ SPHINXBUILD=$(SPHINX_BUILD)
else true; fi
jit.install-info: $(DESTDIR)$(infodir)/libgccjit.info
@@ -255,7 +255,7 @@ $(DESTDIR)$(infodir)/libgccjit.info: doc/libgccjit/info/texinfo/libgccjit.info i
-$(INSTALL_DATA) $< $@
doc/libgccjit/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/html SPHINXBUILD=$(SPHINX_BUILD)
jit.texinfo.install-html: doc/libgccjit/html/html/index.html
@$(NORMAL_INSTALL)
@@ -276,7 +276,7 @@ jit.texinfo.install-html: doc/libgccjit/html/html/index.html
doc/libgccjit/pdf/latex/libgccjit.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/pdf SPHINXBUILD=$(SPHINX_BUILD)
jit.texinfo.install-pdf: doc/libgccjit.pdf
@$(NORMAL_INSTALL)
@@ -295,7 +295,7 @@ SPHINX_BUILD_DIR=jit/sphinx-build
jit.sphinx.html:
$(mkinstalldirs) $(SPHINX_BUILD_DIR)
(cd $(srcdir)/jit/docs && \
- make html BUILDDIR=$(PWD)/$(SPHINX_BUILD_DIR) )
+ make html BUILDDIR=$(PWD)/$(SPHINX_BUILD_DIR) ) SPHINXBUILD=$(SPHINX_BUILD)
jit_htmldir=$(htmldir)/jit
@@ -316,7 +316,7 @@ jit.sphinx.pdf: $(SPHINX_BUILD_DIR)/latex/libgccjit.pdf
$(SPHINX_BUILD_DIR)/latex/libgccjit.pdf:
$(mkinstalldirs) $(SPHINX_BUILD_DIR)
(cd $(srcdir)/jit/docs && \
- make latexpdf BUILDDIR=$(PWD)/$(SPHINX_BUILD_DIR) )
+ make latexpdf BUILDDIR=$(PWD)/$(SPHINX_BUILD_DIR) ) SPHINXBUILD=$(SPHINX_BUILD)
jit.sphinx.install-pdf: $(SPHINX_BUILD_DIR)/latex/libgccjit.pdf
@$(NORMAL_INSTALL)
@@ -336,7 +336,7 @@ jit.tags:
jit.man: doc/libgccjit/man/man/libgccjit.1
doc/libgccjit/man/man/libgccjit.1: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/man
+ + make -C $(srcdir)/../doc man SOURCEDIR=$(abs_srcdir)/jit/doc/ BUILDDIR=$(objdir)/doc/libgccjit/man SPHINXBUILD=$(SPHINX_BUILD)
jit.srcman:
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 14849a061cc..a6202f43848 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -793,10 +793,10 @@ distclean-libtool:
-rm -f libtool config.lt
doc/pdf/latex/libgomp.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
uninstall-info-am:
@$(PRE_UNINSTALL)
@@ -1303,7 +1303,7 @@ stamp-geninsrc: doc/info/texinfo/libgomp.info
@touch $@
doc/info/texinfo/libgomp.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
# target overrides
-include $(tmake_file)
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index dfd5f757ab5..9d1ebc03d2a 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -353,13 +353,13 @@ SPHINX_CONFIG_FILES:=$(srcdir)/doc/conf.py $(srcdir)/../doc/baseconf.py
SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
doc/texinfo/libiberty.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir) BUILDDIR=$(abs_doc_builddir)/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_docdir) BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
doc/pdf/latex/libiberty.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir) BUILDDIR=$(abs_doc_builddir)/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_docdir) BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir) BUILDDIR=$(abs_doc_builddir)/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_docdir) BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
@MAINT@$(srcdir)/functions.texi : stamp-functions
@MAINT@ @true
diff --git a/libitm/Makefile.in b/libitm/Makefile.in
index d2f34b05fa6..c2b03b808e1 100644
--- a/libitm/Makefile.in
+++ b/libitm/Makefile.in
@@ -642,10 +642,10 @@ distclean-libtool:
-rm -f libtool config.lt
doc/pdf/latex/libitm.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
uninstall-html-am:
@$(NORMAL_UNINSTALL)
@@ -1120,7 +1120,7 @@ stamp-geninsrc: doc/info/texinfo/libitm.info
@touch $@
doc/info/texinfo/libitm.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
# GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 259ef2a5f4b..9cf8cf7489a 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -950,10 +950,10 @@ distclean-libtool:
-rm -f libtool config.lt
doc/pdf/latex/libquadmath.pdf: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf
+ + make -C $(srcdir)/../doc latexpdf SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/pdf SPHINXBUILD=$(SPHINX_BUILD)
doc/html/html/index.html: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html
+ + make -C $(srcdir)/../doc html SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/html SPHINXBUILD=$(SPHINX_BUILD)
uninstall-html-am:
@$(NORMAL_UNINSTALL)
@@ -1373,7 +1373,7 @@ SPHINX_FILES:=$(RST_FILES) $(SPHINX_CONFIG_FILES)
export BUGURL=$(REPORT_BUGS_TO)
doc/info/texinfo/libquadmath.info: $(SPHINX_FILES)
- + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info
+ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD)
# GNU Make needs to see an explicit $(MAKE) variable in the command it
# runs to enable its job server during parallel builds. Hence the
next reply other threads:[~2022-07-27 14:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 14:48 Martin Liska [this message]
2022-07-27 18:33 Martin Liska
2022-07-27 18:53 Martin Liska
2022-07-27 18:59 Martin Liska
2022-07-27 19:02 Martin Liska
2022-07-27 19:07 Martin Liska
2022-07-28 12:23 Martin Liska
2022-07-28 12:39 Martin Liska
2022-07-28 13:19 Martin Liska
2022-08-01 4:03 Martin Liska
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=20220727144812.4DA10385AE5B@sourceware.org \
--to=marxin@gcc.gnu.org \
--cc=gcc-cvs@gcc.gnu.org \
/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).