[gcc(refs/vendors/redhat/heads/gcc-10-branch)] maintainer-scripts: Fix jit documentation build with update_web_docs_git

Jakub Jelinek jakub@gcc.gnu.org
Wed Mar 25 09:54:57 GMT 2020


https://gcc.gnu.org/g:a0ae4cbe9d1430b32f674b862a6d8dce0ed81f2a

commit a0ae4cbe9d1430b32f674b862a6d8dce0ed81f2a
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Thu Mar 12 14:46:28 2020 +0100

    maintainer-scripts: Fix jit documentation build with update_web_docs_git
    
    scripts/update_web_docs_git -r 9.3.0 -d gcc-9.3.0
    failed after the sourceware upgrade, there is no python-sphinx10 package and
    python3-sphinx is new enough that the docs build succeeded.
    
    2020-03-12  Jakub Jelinek  <jakub@redhat.com>
    
            * update_web_docs_git: Drop SPHINXBUILD=/usr/bin/sphinx-1.0-build.

Diff:
---
 maintainer-scripts/ChangeLog           | 4 ++++
 maintainer-scripts/update_web_docs_git | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index 4efd47569d4..0467eba7106 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-12  Jakub Jelinek  <jakub@redhat.com>
+
+	* update_web_docs_git: Drop SPHINXBUILD=/usr/bin/sphinx-1.0-build.
+
 2020-02-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc_release: Add support for -b local-git-repo argument.
diff --git a/maintainer-scripts/update_web_docs_git b/maintainer-scripts/update_web_docs_git
index d87a5982f98..996d29bfb68 100755
--- a/maintainer-scripts/update_web_docs_git
+++ b/maintainer-scripts/update_web_docs_git
@@ -183,15 +183,16 @@ done
 # defaulting to "sphinx-build".
 #
 # sphinx is packaged in Fedora and EPEL 6 within "python-sphinx",
+# in RHEL 8 within "python3-sphinx",
 # and in openSUSE within "python-Sphinx".
 #
 # For EPEL6, python-sphinx is sphinx 0.6.6, which is missing various
 # directives (e.g. ":c:macro:"), so we need the variant
 # python-sphinx10 package.  The latter installs its executable as
 #   /usr/bin/sphinx-1.0-build
-# so we need to override SPHINXBUILD with this when invoking "make".
+# so we needed to override SPHINXBUILD with this when invoking "make".
 pushd gcc/gcc/jit/docs
-make SPHINXBUILD=/usr/bin/sphinx-1.0-build html || true
+make html || true
 popd
 cp -a gcc/gcc/jit/docs/_build/html jit
 mkdir -p $DOCSDIR/jit


More information about the Gcc-cvs mailing list