On Thu, Feb 23, 2023 at 5:40 AM John Snow <js...@redhat.com> wrote:> > For what it's worth, python3-sphinx-5.0.2-2.fc37.noarch provides > > > > /usr/bin/sphinx-build > > /usr/bin/sphinx-build-3 > > /usr/bin/sphinx-build-3.11 > > > > where the latter two are symbolic links to the first. No need to check > > for sphinx-build-3 here. > > Oh, I see. I guess it should be fine, but only if we explicitly drop > support for the 3.6 version that comes with CentOS. I'm not entirely > sure if "sphinx-build-3" is used anywhere else, I *think* it's just an > rpm-ism.
Are you sure CentOS has a problem there? I checked python3-sphinx-1.7.6-3.el8 and it has sphinx-build as a symlink too: $ rpm2cpio ../python3-sphinx-1.7.6-3.el8.noarch.rpm |cpio -idv $ ls -l usr/bin/ total 16 -rwxr-xr-x. 1 pbonzini users 403 Feb 23 09:50 sphinx-apidoc lrwxrwxrwx. 1 pbonzini users 13 Feb 23 09:50 sphinx-apidoc-3 -> sphinx-apidoc lrwxrwxrwx. 1 pbonzini users 13 Feb 23 09:50 sphinx-apidoc-3.6 -> sphinx-apidoc -rwxr-xr-x. 1 pbonzini users 405 Feb 23 09:50 sphinx-autogen lrwxrwxrwx. 1 pbonzini users 14 Feb 23 09:50 sphinx-autogen-3 -> sphinx-autogen lrwxrwxrwx. 1 pbonzini users 14 Feb 23 09:50 sphinx-autogen-3.6 -> sphinx-autogen -rwxr-xr-x. 1 pbonzini users 401 Feb 23 09:50 sphinx-build lrwxrwxrwx. 1 pbonzini users 12 Feb 23 09:50 sphinx-build-3 -> sphinx-build lrwxrwxrwx. 1 pbonzini users 12 Feb 23 09:50 sphinx-build-3.6 -> sphinx-build -rwxr-xr-x. 1 pbonzini users 411 Feb 23 09:50 sphinx-quickstart lrwxrwxrwx. 1 pbonzini users 17 Feb 23 09:50 sphinx-quickstart-3 -> sphinx-quickstart lrwxrwxrwx. 1 pbonzini users 17 Feb 23 09:50 sphinx-quickstart-3.6 -> sphinx-quickstart And it's 3.6-based: $ ls -l usr/lib total 0 drwxr-xr-x. 3 pbonzini users 27 Feb 23 09:50 python3.6 $ head -4 usr/bin/sphinx-build #!/usr/libexec/platform-python # EASY-INSTALL-ENTRY-SCRIPT: 'Sphinx==1.7.6','console_scripts','sphinx-build' __requires__ = 'Sphinx==1.7.6' import re This alternative, simpler patch should do it: diff --git a/docs/meson.build b/docs/meson.build index 9136fed3b730..1ab5a9882018 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 diff --git a/meson_options.txt b/meson_options.txt index 7e5801db90f9..92440429b1d0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,7 +12,7 @@ option('pkgversion', type : 'string', value : '', description: 'use specified string as sub-version of the package') option('smbd', type : 'string', value : '', description: 'Path to smbd for slirp networking') -option('sphinx_build', type : 'string', value : '', +option('sphinx_build', type : 'string', value : 'sphinx-build', description: 'Use specified sphinx-build for building document') option('iasl', type : 'string', value : '', description: 'Path to ACPI disassembler') Paolo