[PATCH] meson: Fix rst2html5 detection

Andrea Bolognani posted 1 patch 2 years, 4 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20211103133211.131507-1-abologna@redhat.com
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] meson: Fix rst2html5 detection
Posted by Andrea Bolognani 2 years, 4 months ago
The first part of the version string contains the name that the
rst2html5 command was invoked as, which can differ based on the
operating system: on FreeBSD, for example, it's rst2html5.py
instead of just rst2html5.

Fix our detection logic so that it works regardless of the
specific name used for the docutils-provided rst2html5 command.

Fixes: cf0c9e186565e886a0016b2b269088b3eed3d26d
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
Pushed as a CI fix.

 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 3a9066b9fe..6f5d480c1e 100644
--- a/meson.build
+++ b/meson.build
@@ -836,8 +836,8 @@ endforeach
 # Use this knowledge to detect the version that we know doesn't work
 # for building libvirt and reject it
 rst2html5_version = run_command(rst2html5_prog, '--version')
-rst2html5_version = rst2html5_version.stdout().split('(')
-if rst2html5_version[0] != 'rst2html5 '
+rst2html5_version = rst2html5_version.stdout().split(' ')
+if rst2html5_version[1] != '(Docutils'
   error('Please uninstall the rst2html5 package and install the docutils package')
 endif
 
-- 
2.31.1