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/devel/sphinx] contrib: use sphinx-build from a venv Date: Thu, 28 Jul 2022 12:12:09 +0000 (GMT) [thread overview] Message-ID: <20220728121209.B002F3857374@sourceware.org> (raw) https://gcc.gnu.org/g:3168c2f8ede30bdeb8adb607884101850ff50712 commit 3168c2f8ede30bdeb8adb607884101850ff50712 Author: Martin Liska <mliska@suse.cz> Date: Mon Jul 25 15:57:32 2022 +0200 contrib: use sphinx-build from a venv maintainer-scripts/ChangeLog: * update_web_docs_git: Use sphinx-build from a venv so that we can use a recent version. Diff: --- maintainer-scripts/update_web_docs_git | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/maintainer-scripts/update_web_docs_git b/maintainer-scripts/update_web_docs_git index 996d29bfb68..6c38e213562 100755 --- a/maintainer-scripts/update_web_docs_git +++ b/maintainer-scripts/update_web_docs_git @@ -176,23 +176,14 @@ for file in $MANUALS; do fi done -# The jit is a special-case, using sphinx rather than texinfo. -# Specifically, the jit docs need sphinx 1.0 or later. +# The jit is a special-case, using Sphinx rather than texinfo. +# Specifically, the jit docs need Sphinx 3.0 or later. # -# The jit/docs Makefile uses the executable $(SPHINXBUILD), -# 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 needed to override SPHINXBUILD with this when invoking "make". +# Use the Sphinx installed in a virtual environment so that +# we don't depend on a system package. + pushd gcc/gcc/jit/docs -make html || true +make html SPHINXBUILD=/home/gccadmin/venv/bin/sphinx-build || true popd cp -a gcc/gcc/jit/docs/_build/html jit mkdir -p $DOCSDIR/jit
reply other threads:[~2022-07-28 12:12 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220728121209.B002F3857374@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: linkBe 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).