From b7f80f5b79539f770b1279ca9cc9c3e83254bd79 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 24 Jan 2020 19:33:16 +0100 Subject: [PATCH] Allow git builds of Sphinx When using a non-release version of Sphinx, from a local build (with improvements for kernel doc handling, why not), sphinx-build --version reports versions of the form sphinx-build 3.0.0+/b2772571aa9a i.e. base version, a plus symbol, slash, and the start of the git hash of whatever repository the command is run in (no, not the hash that was used to build Sphinx!). This patch fixes the installation check in sphinx-pre-install to recognise such version output. Signed-off-by: Stephen Kitt Link: https://lore.kernel.org/r/20200124183316.1719218-1-steve@sk2.org Signed-off-by: Jonathan Corbet --- scripts/sphinx-pre-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index 470ccfe678aa7..a8f0c002a3405 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -272,7 +272,7 @@ sub check_sphinx() open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error"; while () { - if (m/^\s*sphinx-build\s+([\d\.]+)$/) { + if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) { $cur_version=$1; last; } -- 2.39.5