[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 38/68] configure: move --enable-docs and --disable-docs back to co
From: |
Paolo Bonzini |
Subject: |
[PULL 38/68] configure: move --enable-docs and --disable-docs back to configure |
Date: |
Wed, 17 May 2023 19:44:50 +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
- [PULL 22/68] mkvenv: add nested venv workaround, (continued)
- [PULL 22/68] mkvenv: add nested venv workaround, Paolo Bonzini, 2023/05/17
- [PULL 29/68] tests/docker: add python3-venv dependency, Paolo Bonzini, 2023/05/17
- [PULL 34/68] python/wheels: add vendored meson package, Paolo Bonzini, 2023/05/17
- [PULL 37/68] tests: Use configure-provided pyvenv for tests, Paolo Bonzini, 2023/05/17
- [PULL 41/68] Python: Drop support for Python 3.6, Paolo Bonzini, 2023/05/17
- [PULL 45/68] meson: regenerate meson-buildoptions.sh, Paolo Bonzini, 2023/05/17
- [PULL 26/68] mkvenv: use pip's vendored distlib as a fallback, Paolo Bonzini, 2023/05/17
- [PULL 30/68] tests/vm: Configure netbsd to use Python 3.10, Paolo Bonzini, 2023/05/17
- [PULL 32/68] python: add vendor.py utility, Paolo Bonzini, 2023/05/17
- [PULL 33/68] configure: create a python venv unconditionally, Paolo Bonzini, 2023/05/17
- [PULL 38/68] configure: move --enable-docs and --disable-docs back to configure,
Paolo Bonzini <=
- [PULL 36/68] qemu.git: drop meson git submodule, Paolo Bonzini, 2023/05/17
- [PULL 40/68] configure: add --enable-pypi and --disable-pypi, Paolo Bonzini, 2023/05/17
- [PULL 42/68] configure: Add courtesy hint to Python version failure message, Paolo Bonzini, 2023/05/17
- [PULL 43/68] mkvenv: mark command as required, Paolo Bonzini, 2023/05/17
- [PULL 27/68] mkvenv: avoid ensurepip if pip is installed, Paolo Bonzini, 2023/05/17
- [PULL 57/68] build: move coroutine backend selection to meson, Paolo Bonzini, 2023/05/17
- [PULL 56/68] build: move SafeStack tests to meson, Paolo Bonzini, 2023/05/17
- [PULL 35/68] configure: use 'mkvenv ensure meson' to bootstrap meson, Paolo Bonzini, 2023/05/17
- [PULL 39/68] configure: bootstrap sphinx with mkvenv, Paolo Bonzini, 2023/05/17
- [PULL 44/68] python: bump some of the dependencies, Paolo Bonzini, 2023/05/17