[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 21/27] configure: move --enable-docs and --disable-docs back t
|
From: |
Paolo Bonzini |
|
Subject: |
[PATCH v2 21/27] configure: move --enable-docs and --disable-docs back to configure |
|
Date: |
Tue, 16 May 2023 12:59:02 +0200 |
From: John Snow <jsnow@redhat.com>
Move this option back from meson into configure for the purposes of
using the configuration value to bootstrap Sphinx in different ways
based on this value.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20230511035435.734312-21-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure b/configure
index 4519c4d412f8..f8308926bbc6 100755
--- a/configure
+++ b/configure
@@ -279,6 +279,7 @@ debug_tcg="no"
sanitizers="no"
tsan="no"
fortify_source="yes"
+docs="auto"
EXESUF=""
modules="no"
prefix="/usr/local"
@@ -750,6 +751,10 @@ for opt do
;;
--disable-debug-info) meson_option_add -Ddebug=false
;;
+ --enable-docs) docs=enabled
+ ;;
+ --disable-docs) docs=disabled
+ ;;
--enable-modules)
modules="yes"
;;
@@ -2615,6 +2620,7 @@ if test "$skip_meson" = no; then
# QEMU options
test "$cfi" != false && meson_option_add "-Dcfi=$cfi"
+ test "$docs" != auto && meson_option_add "-Ddocs=$docs"
test "$fdt" != auto && meson_option_add "-Dfdt=$fdt"
test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add
"-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
test "$qemu_suffix" != qemu && meson_option_add "-Dqemu_suffix=$qemu_suffix"
--
2.40.1
- [PATCH v2 11/27] mkvenv: work around broken pip installations on Debian 10, (continued)
- [PATCH v2 11/27] mkvenv: work around broken pip installations on Debian 10, Paolo Bonzini, 2023/05/16
- [PATCH v2 19/27] qemu.git: drop meson git submodule, Paolo Bonzini, 2023/05/16
- [PATCH v2 23/27] configure: add --enable-pypi and --disable-pypi, Paolo Bonzini, 2023/05/16
- [PATCH v2 16/27] configure: create a python venv unconditionally, Paolo Bonzini, 2023/05/16
- [PATCH v2 12/27] tests/docker: add python3-venv dependency, Paolo Bonzini, 2023/05/16
- [PATCH v2 14/27] tests/vm: add py310-expat to NetBSD, Paolo Bonzini, 2023/05/16
- [PATCH v2 18/27] configure: use 'mkvenv ensure meson' to bootstrap meson, Paolo Bonzini, 2023/05/16
- [PATCH v2 25/27] configure: Add courtesy hint to Python version failure message, Paolo Bonzini, 2023/05/16
- [PATCH v2 21/27] configure: move --enable-docs and --disable-docs back to configure,
Paolo Bonzini <=
- [PATCH v2 09/27] mkvenv: use pip's vendored distlib as a fallback, Paolo Bonzini, 2023/05/16
- [PATCH v2 26/27] mkvenv: mark command as required, Paolo Bonzini, 2023/05/16
- [PATCH v2 22/27] configure: bootstrap sphinx with mkvenv, Paolo Bonzini, 2023/05/16
- [PATCH v2 17/27] python/wheels: add vendored meson package, Paolo Bonzini, 2023/05/16
- [PATCH v2 24/27] Python: Drop support for Python 3.6, Paolo Bonzini, 2023/05/16
- [PATCH v2 27/27] python: bump some of the dependencies, Paolo Bonzini, 2023/05/16
- [PATCH v2 10/27] mkvenv: avoid ensurepip if pip is installed, Paolo Bonzini, 2023/05/16