From 1b1be8d3cc57a6ad86c3a54fb2750adfae707ae3 Mon Sep 17 00:00:00 2001 From: John Snow Date: Mon, 20 Feb 2023 20:24:55 -0500 Subject: meson: stop looking for 'sphinx-build-3' Once upon a time, "sphinx-build" on certain RPM platforms invoked specifically a Python 2.x version, while "sphinx-build-3" was a distro shim for the Python 3.x version. These days, none of our supported platforms utilize a 2.x version, and those that still have 'sphinx-build-3' make it a symbolic link to 'sphinx-build'. Not searching for 'sphinx-build-3' will prefer pip/venv installed versions of sphinx if they're available. This adds an extremely convenient ability to test document building ability in QEMU across multiple versions of Sphinx for the purposes of compatibility testing. Signed-off-by: John Snow Message-Id: <20230221012456.2607692-6-jsnow@redhat.com> Signed-off-by: Paolo Bonzini --- docs/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'docs/meson.build') diff --git a/docs/meson.build b/docs/meson.build index bbcdccce68..bb72c10ea8 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,10 +1,5 @@ -if get_option('sphinx_build') == '' - sphinx_build = find_program(['sphinx-build-3', 'sphinx-build'], - required: get_option('docs')) -else - sphinx_build = find_program(get_option('sphinx_build'), - required: get_option('docs')) -endif +sphinx_build = find_program(get_option('sphinx_build'), + required: get_option('docs')) # Check if tools are available to build documentation. build_docs = false -- cgit 1.4.1