diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-03-12 14:46:28 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-03-12 14:46:28 +0100 |
| commit | a0ae4cbe9d1430b32f674b862a6d8dce0ed81f2a (patch) | |
| tree | abc9add8946aedd33c0d875f51104635915d0723 /maintainer-scripts | |
| parent | 1dc00a8ec9aeba86b74b16bff6f171824bb7b4a1 (diff) | |
| download | gcc-a0ae4cbe9d1430b32f674b862a6d8dce0ed81f2a.zip gcc-a0ae4cbe9d1430b32f674b862a6d8dce0ed81f2a.tar.gz gcc-a0ae4cbe9d1430b32f674b862a6d8dce0ed81f2a.tar.bz2 | |
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.
Diffstat (limited to 'maintainer-scripts')
| -rw-r--r-- | maintainer-scripts/ChangeLog | 4 | ||||
| -rwxr-xr-x | 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 4efd475..0467eba 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 d87a598..996d29b 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 |