[Mesa-dev] [PATCH 02/12] meson: bump the minimum LLVM version to 5.0.1

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Currently the minimal version is 3.3 with 3.9 for r600+opencl.

We kept it as low, since transitioning to newer ones is pain on Windows.
With issues ranging from build problems, memory leaks and various other
small nitpicks throughout.

Currently we use 5.0.1 for our Appveyor testing, so we can bump the
numbers officially and start ripping out the hacks we had in place.

All recent distribution (versions) have it, with the odd old one left in
the dark. On those platforms, realistically nobody is using mesa-git.

Archlinux: 6.0.1
CentOS: ?
Debian testing: 6.0
Fedora 27: 5.0.1
Gentoo: 5.0.2
OpenSuse 15: 5.0.1
Ubuntu 18.04LTS: 6.0

Cc: Dylan Baker <dylan at pnwbakers.com>
Cc: Eric Engestrom <eric.engestrom at intel.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 meson.build | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index 18667988bac..492334e1c0a 100644
--- a/meson.build
+++ b/meson.build
@@ -1179,10 +1179,8 @@ if with_amd_vk or with_gallium_radeonsi
   _llvm_version = '>= 6.0.0'
 elif with_gallium_swr
   _llvm_version = '>= 6.0.0'
-elif with_gallium_opencl or with_gallium_r600
-  _llvm_version = '>= 3.9.0'
 else
-  _llvm_version = '>= 3.3.0'
+  _llvm_version = '>= 5.0.1'
 endif
 
 _shared_llvm = get_option('shared-llvm')
@@ -1207,16 +1205,9 @@ endif
 if with_llvm
   _llvm_version = dep_llvm.version().split('.')
 
-  # 3 digits versions in LLVM only started from 3.4.1 on
-  if dep_llvm.version().version_compare('>= 3.4.1')
-    _llvm_patch = _llvm_version[2]
-  else
-    _llvm_patch = '0'
-  endif
-
   pre_args += [
     '-DHAVE_LLVM=0x0 at 0@0 at 1@'.format(_llvm_version[0], _llvm_version[1]),
-    '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_patch),
+    '-DMESA_LLVM_VERSION_PATCH=@0@'.format(_llvm_version[2]),
   ]
 
   # LLVM can be built without rtti, turning off rtti changes the ABI of C++
-- 
2.19.1