Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dependencies: Also strip git version from llvm version 

If LLVM is built from a git mirror instead of from SVN it will have
"git-<very short sha>" at the end of the version. We need to remove that
so that version comparison will work correctly.

Fixes: #2786
This commit is contained in:
Dylan Baker 2017-12-15 11:52:05 -08:00 committed by Jussi Pakkanen
parent 83fb76c9ae
commit 0bbc9df74a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/dependencies/dev.py
View File

@ -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-<very short sha>"
# 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'))