friedkiwi/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: drop sphinx-build < 1.7 compatiblity check

Browse Source 
Since commit fe791b7fcc ("Python: bump minimum sphinx version to
3.4.3"), we no longer support building with sphinx-build < 3.4.3

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
This commit is contained in:
Marc-André Lureau
2026-05-11 14:42:07 +04:00
parent 4f64d7e336
commit 13e06c64d4
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/meson.build
View File

@@ -4,24 +4,12 @@ sphinx_build = find_program(fs.parent(python.full_path()) / 'sphinx-build',
# Check if tools are available to build documentation. # Check if tools are available to build documentation.
build_docs = false build_docs = false
if sphinx_build.found() if sphinx_build.found()
SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build, '-q'] SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build, '-q', '-j', 'auto']
# If we're making warnings fatal, apply this to Sphinx runs as well # If we're making warnings fatal, apply this to Sphinx runs as well
if get_option('werror') if get_option('werror')
SPHINX_ARGS += [ '-W', '-Dkerneldoc_werror=1' ] SPHINX_ARGS += [ '-W', '-Dkerneldoc_werror=1' ]
endif endif
sphinx_version = run_command(SPHINX_ARGS + ['--version'],
check: true).stdout().split()[1]
if sphinx_version.version_compare('>=1.7.0')
SPHINX_ARGS += ['-j', 'auto']
else
nproc = find_program('nproc')
if nproc.found()
jobs = run_command(nproc, check: true).stdout()
SPHINX_ARGS += ['-j', jobs]
endif
endif
# This is a bit awkward but works: create a trivial document and # This is a bit awkward but works: create a trivial document and
# try to run it with our configuration file (which enforces a # try to run it with our configuration file (which enforces a
# version requirement). This will fail if sphinx-build is too old. # version requirement). This will fail if sphinx-build is too old.