From nobody Mon Feb 9 16:02:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581616717555661.0409676500534; Thu, 13 Feb 2020 09:58:37 -0800 (PST) Received: from localhost ([::1]:57122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Il2-00021k-6l for importer@patchew.org; Thu, 13 Feb 2020 12:58:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33484) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2IjP-0008W9-N7 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 12:56:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2IjO-0002IX-1z for qemu-devel@nongnu.org; Thu, 13 Feb 2020 12:56:55 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:46094) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2IjN-0002GO-Q1 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 12:56:53 -0500 Received: by mail-wr1-x435.google.com with SMTP id z7so7788253wrl.13 for ; Thu, 13 Feb 2020 09:56:53 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id p26sm3692913wmc.24.2020.02.13.09.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 09:56:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bNrhvkUv2TO4FrpIdTAVSOaQ1Nd3Ip9jUXQiwdMHf3E=; b=MVO+IU7TLrNzOQMOBVXUYyAYHNCX0Raac3P92MIQ0SK+N+6uFx2mYQsFYkTxRTbdXL IQ20OlkDIoZbE1GBCTcw3xddGo2D6nigt34rk0B0610Rs2nTkY8ZUHWu2+EA9es0mezb CSQOEBHyv9EzkTDWqTKwsFECHFLf3R+VbDQ/k7x0gQGqEaB8QI687jn0pbq8nNANQdgo TWJA7RUT0V4pxgNg0WjJF+ee7zon+nhlJku9O7dzXxnHzVnxDaELd//IR/uMgrLdy3t7 u6GuNignHSol4M3dUuFTgO7+knsAXkJLc+kL+4aoHSrA5zId701u05i/MGTM6LF/YxOe xyQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bNrhvkUv2TO4FrpIdTAVSOaQ1Nd3Ip9jUXQiwdMHf3E=; b=pvhukesc9Ea0bNNheovexnCtVPW6xHVXq/QF1z6ocrYICDrX7oMr3SaW08tCoXzdTy hxFErw5BDfPWT8iOvNmU7KDzXzWKONTx9K7DxbTCk9LrrjKUH9tL6BzElBBKoKNAdDEo mYcbLgl7AXJtDyUQIjQANglTj762Lzml5A/0thhUJoSMc2CmlMIFho/XjPwnlFHS46Vg fAhiW5tfP2jR81A6AIJjpkiw6ZwGodfLmx8qbKCoh+DwYeVzrzMweAbHji62qsin5sXo GryPbo3iR6QqdFpp5E5oDdQlYgZcqglDGy3tnSgNO114iPt1JO2TFEtWcQVHdOKFtUph YmPw== X-Gm-Message-State: APjAAAXj7eKCB49Gjgo8oKbYQrIyXvFNAn3F25v5OiwCU3idcNZezqf4 rMCC9O581Cbh1VO/9wrcwUe4wcdkOtg= X-Google-Smtp-Source: APXvYqywKPn91NGIhyfCtdzGY7rOfxc3X75BgpjEC8sKIXamZVXJk1+/U8iWFTJFe7KXYcviDv/ICQ== X-Received: by 2002:a5d:4085:: with SMTP id o5mr22530913wrp.321.1581616612367; Thu, 13 Feb 2020 09:56:52 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v2 01/30] configure: Allow user to specify sphinx-build binary Date: Thu, 13 Feb 2020 17:56:18 +0000 Message-Id: <20200213175647.17628-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213175647.17628-1-peter.maydell@linaro.org> References: <20200213175647.17628-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Michael Roth , Stefan Hajnoczi , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Currently we insist on using 'sphinx-build' from the $PATH; allow the user to specify the binary to use. This will be more useful as we become pickier about the capabilities we require (eg needing a Python 3 sphinx-build). Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Peter Maydell --- configure | 10 +++++++++- Makefile | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 115dc38085f..0aceb8e50db 100755 --- a/configure +++ b/configure @@ -584,6 +584,7 @@ query_pkg_config() { } pkg_config=3Dquery_pkg_config sdl2_config=3D"${SDL2_CONFIG-${cross_prefix}sdl2-config}" +sphinx_build=3Dsphinx-build =20 # If the user hasn't specified ARFLAGS, default to 'rv', just as make does. ARFLAGS=3D"${ARFLAGS-rv}" @@ -975,6 +976,8 @@ for opt do ;; --python=3D*) python=3D"$optarg" ;; + --sphinx-build=3D*) sphinx_build=3D"$optarg" + ;; --gcov=3D*) gcov_tool=3D"$optarg" ;; --smbd=3D*) smbd=3D"$optarg" @@ -1677,6 +1680,7 @@ Advanced options (experts only): --make=3DMAKE use specified make [$make] --install=3DINSTALL use specified install [$install] --python=3DPYTHON use specified python [$python] + --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] --smbd=3DSMBD use specified smbd [$smbd] --with-git=3DGIT use specified git [$git] --static enable static build [$static] @@ -4799,7 +4803,7 @@ has_sphinx_build() { # sphinx-build doesn't exist at all or if it is too old. mkdir -p "$TMPDIR1/sphinx" touch "$TMPDIR1/sphinx/index.rst" - sphinx-build -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR= 1/sphinx/out" >/dev/null 2>&1 + $sphinx_build -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDI= R1/sphinx/out" >/dev/null 2>&1 } =20 # Check if tools are available to build documentation. @@ -6474,6 +6478,9 @@ echo "QEMU_LDFLAGS $QEMU_LDFLAGS" echo "make $make" echo "install $install" echo "python $python ($python_version)" +if test "$docs" !=3D "no"; then + echo "sphinx-build $sphinx_build" +fi echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" !=3D "no" ; then echo "smbd $smbd" @@ -7503,6 +7510,7 @@ echo "INSTALL_DATA=3D$install -c -m 0644" >> $config_= host_mak echo "INSTALL_PROG=3D$install -c -m 0755" >> $config_host_mak echo "INSTALL_LIB=3D$install -c -m 0644" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak +echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=3D$iasl" >> $config_host_mak diff --git a/Makefile b/Makefile index f0e1a2fc1dc..430bbad0557 100644 --- a/Makefile +++ b/Makefile @@ -1030,7 +1030,7 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ # Note the use of different doctree for each (manual, builder) tuple; # this works around Sphinx not handling parallel invocation on # a single doctree: https://github.com/sphinx-doc/sphinx/issues/2946 -build-manual =3D $(call quiet-command,CONFDIR=3D"$(qemu_confdir)" sphinx-b= uild $(if $(V),,-q) -W -b $2 -D version=3D$(VERSION) -D release=3D"$(FULL_V= ERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPH= INX","$(MANUAL_BUILDDIR)/$1") +build-manual =3D $(call quiet-command,CONFDIR=3D"$(qemu_confdir)" $(SPHINX= _BUILD) $(if $(V),,-q) -W -b $2 -D version=3D$(VERSION) -D release=3D"$(FUL= L_VERSION)" -d .doctrees/$1-$2 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"= SPHINX","$(MANUAL_BUILDDIR)/$1") # We assume all RST files in the manual's directory are used in it manual-deps =3D $(wildcard $(SRC_PATH)/docs/$1/*.rst) \ $(wildcard $(SRC_PATH)/docs/$1/*.rst.inc) \ --=20 2.20.1