Module: Mesa Branch: master Commit: 8fae5eddd9982f4586d76471d0196befeb46de24 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fae5eddd9982f4586d76471d0196befeb46de24
Author: Greg V <[email protected]> Date: Wed Jan 24 21:02:43 2018 +0300 meson: handle LLVM 'x.x.xgit-revision' versions When LLVM is built inside of a git repo (even way below, e.g. /usr/ports/.git exists, and LLVM is built in /usr/ports/devel/llvm50/work), its version becomes something like 5.0.0git-f8ab206b2176. New meson versions already handle this, but we support older versions too. Fixes: 673dda8330769 ("meson: build "radv" vulkan driver for radeon hardware") Reviewed-by: Dylan Baker <[email protected]> --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 56ff916c4b..8a814a596c 100644 --- a/meson.build +++ b/meson.build @@ -1022,11 +1022,15 @@ else endif if with_llvm _llvm_version = dep_llvm.version().split('.') - # Development versions of LLVM have an 'svn' suffix, we don't want that for - # our version checks. + # Development versions of LLVM have an 'svn' or 'git' suffix, we don't want + # that for our version checks. + # svn suffixes are stripped by meson as of 0.43, and git suffixes are + # strippped as of 0.44, but we support older meson versions. _llvm_patch = _llvm_version[2] if _llvm_patch.endswith('svn') _llvm_patch = _llvm_patch.split('s')[0] + elif _llvm_patch.contains('git') + _llvm_patch = _llvm_patch.split('g')[0] endif pre_args += [ '-DHAVE_LLVM=0x0@0@0@1@'.format(_llvm_version[0], _llvm_version[1]), _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
