[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 20/27] configure: move --enable-docs and --disable-docs back to c
|
From: |
John Snow |
|
Subject: |
[PATCH 20/27] configure: move --enable-docs and --disable-docs back to configure |
|
Date: |
Wed, 10 May 2023 23:54:28 -0400 |
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>
---
configure | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure b/configure
index 6e4499a68a..3e74c54f29 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"
@@ -751,6 +752,10 @@ for opt do
;;
--disable-debug-info) meson_option_add -Ddebug=false
;;
+ --enable-docs) docs=enabled
+ ;;
+ --disable-docs) docs=disabled
+ ;;
--enable-modules)
modules="yes"
;;
@@ -2630,6 +2635,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.0
- Re: [PATCH 07/27] mkvenv: add diagnose() method for ensure() failures, (continued)
[PATCH 13/27] tests/vm: add py310-expat to NetBSD, John Snow, 2023/05/10
[PATCH 12/27] tests/vm: Configure netbsd to use Python 3.10, John Snow, 2023/05/10
[PATCH 09/27] mkvenv: create pip binary in virtual environment, John Snow, 2023/05/10
[PATCH 11/27] tests/docker: add python3-venv dependency, John Snow, 2023/05/10
[PATCH 14/27] python: add vendor.py utility, John Snow, 2023/05/10
[PATCH 15/27] configure: create a python venv unconditionally, John Snow, 2023/05/10
[PATCH 17/27] configure: use 'mkvenv ensure meson' to bootstrap meson, John Snow, 2023/05/10
[PATCH 19/27] tests: Use configure-provided pyvenv for tests, John Snow, 2023/05/10
[PATCH 20/27] configure: move --enable-docs and --disable-docs back to configure,
John Snow <=
[PATCH 10/27] mkvenv: work around broken pip installations on Debian 10, John Snow, 2023/05/10
[PATCH 18/27] qemu.git: drop meson git submodule, John Snow, 2023/05/10
[PATCH 21/27] configure: bootstrap sphinx with mkvenv, John Snow, 2023/05/10
[PATCH 23/27] Python: Drop support for Python 3.6, John Snow, 2023/05/10
[PATCH 22/27] configure: add --enable-pypi and --disable-pypi, John Snow, 2023/05/10
[PATCH 25/27] mkvenv: mark command as required, John Snow, 2023/05/10
[PATCH 24/27] configure: Add courtesy hint to Python version failure message, John Snow, 2023/05/10
[PATCH 26/27] python: bump some of the dependencies, John Snow, 2023/05/10
[PATCH 27/27] mkvenv.py: experiment; use distlib to generate script entry points, John Snow, 2023/05/10