From 0bbc9df74a69c98f52a51c530f658746d0ea95c4 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 15 Dec 2017 11:52:05 -0800 Subject: [PATCH] dependencies: Also strip git version from llvm version If LLVM is built from a git mirror instead of from SVN it will have "git-" at the end of the version. We need to remove that so that version comparison will work correctly. Fixes: #2786 --- mesonbuild/dependencies/dev.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 6bab1734d..91414d5b0 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -150,7 +150,12 @@ class LLVMDependency(ConfigToolDependency): # Currently meson doesn't really attempt to handle pre-release versions, # so strip the 'svn' off the end, since it will probably cuase problems # for users who want the patch version. + # + # If LLVM is built from svn then "svn" will be appended to the version + # string, if it's built from a git mirror then "git-" + # will be appended instead. self.version = self.version.rstrip('svn') + self.version = self.version.split('git')[0] self.provided_modules = self.get_config_value(['--components'], 'modules') modules = stringlistify(extract_as_list(kwargs, 'modules'))