From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id A77143858C52; Wed, 9 Nov 2022 09:10:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A77143858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667985013; bh=bS1ssyJfJt2FcnsvFivOBZOtoILWV9HMLc8pCWmjipY=; h=From:To:Subject:Date:From; b=ey+MWfFaQfxpFhDts6G28Ix1p49CETLWqTToMAluHBz1E7aeusLnMLy5FwTUmkPjF PsBFI8naeGUWNz6O2+yWiL1mfAHOBmbSGemN3pTfnn6ZIGN9nvuN2zJJH+3qpLsUU4 dI4+0iNEWkIZAEfVwUx9Xg+kjUgQc8eSD8CXxzFI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3843] sphinx: fix building if sphinx-build is missing X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 4287e8168f89e90b3dff3a50f3ada40be53e0e01 X-Git-Newrev: 1f9c79367e136e0ca5b775562e6111e1a0d0046f Message-Id: <20221109091013.A77143858C52@sourceware.org> Date: Wed, 9 Nov 2022 09:10:13 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1f9c79367e136e0ca5b775562e6111e1a0d0046f commit r13-3843-g1f9c79367e136e0ca5b775562e6111e1a0d0046f Author: Martin Liska Date: Wed Nov 9 10:07:32 2022 +0100 sphinx: fix building if sphinx-build is missing libgomp/ChangeLog: * Makefile.in: Build info pages conditionally. libitm/ChangeLog: * Makefile.in: Build info pages conditionally. libquadmath/ChangeLog: * Makefile.in: Build info pages conditionally. Diff: --- libgomp/Makefile.in | 5 ++++- libitm/Makefile.in | 5 ++++- libquadmath/Makefile.in | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in index 9d1787d8458..0c016980c3d 100644 --- a/libgomp/Makefile.in +++ b/libgomp/Makefile.in @@ -1304,7 +1304,10 @@ 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 SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \ + else true; fi + # target overrides -include $(tmake_file) diff --git a/libitm/Makefile.in b/libitm/Makefile.in index 38a7e5bf731..f51858db8c7 100644 --- a/libitm/Makefile.in +++ b/libitm/Makefile.in @@ -1121,7 +1121,10 @@ 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 SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \ + else true; fi + # 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 d551f56ce62..864ebc6048a 100644 --- a/libquadmath/Makefile.in +++ b/libquadmath/Makefile.in @@ -1374,7 +1374,9 @@ 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 SPHINXBUILD=$(SPHINX_BUILD) + + if [ x$(HAS_SPHINX_BUILD) = xhas-sphinx-build ]; then \ + make -C $(srcdir)/../doc info SOURCEDIR=$(abs_srcdir)/doc BUILDDIR=$(abs_doc_builddir)/info SPHINXBUILD=$(SPHINX_BUILD); \ + else true; fi # GNU Make needs to see an explicit $(MAKE) variable in the command it # runs to enable its job server during parallel builds. Hence the