From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id B002F3857374; Thu, 28 Jul 2022 12:12:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B002F3857374 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/sphinx] contrib: use sphinx-build from a venv X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/devel/sphinx X-Git-Oldrev: 82dc469da3895f8f48083448877ca932f5f24587 X-Git-Newrev: 3168c2f8ede30bdeb8adb607884101850ff50712 Message-Id: <20220728121209.B002F3857374@sourceware.org> Date: Thu, 28 Jul 2022 12:12:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jul 2022 12:12:09 -0000 https://gcc.gnu.org/g:3168c2f8ede30bdeb8adb607884101850ff50712 commit 3168c2f8ede30bdeb8adb607884101850ff50712 Author: Martin Liska 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