Mesa (master): configure.ac: bump Clover LLVM requirement to 3.9

[Emil Velikov]

Module: Mesa
Branch: master
Commit: a14ecdab165101afcce6ce8b80003d57b7812c07
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a14ecdab165101afcce6ce8b80003d57b7812c07

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Oct  3 17:51:16 2017 +0100

configure.ac: bump Clover LLVM requirement to 3.9

The only driver that utilises Clover already depends on LLVM 3.9.
Close to every supported distribution has said version.

Additionally libclc also requires LLVM 3.9.

With this in mind, we can safely bump the requirement.

There is a handful of dead code that we could remove, which will be
resolved with later commits.

Note: this drops the LLVM 3.6 build from the Travis build. LLVM 3.9 (and
later) are already covered in there.

https://lists.freedesktop.org/archives/mesa-dev/2017-September/170028.html

v2: Add reference to discussion thread (Eric), adjust libclc LLVM req.
(Jan).

Cc: Aaron Watry <awatry at gmail.com>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
Acked-by: Vedran Miletić <vedran at miletic.net>
Acked-by: Jan Vesely <jan.vesely at rutgers.edu>
Acked-by: Francisco Jerez <currojerez at riseup.net>

---

 .travis.yml  | 38 --------------------------------------
 configure.ac |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d16d6b3c25..b1ead14f49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,44 +115,6 @@ matrix:
             - libunwind8-dev
     - env:
         # NOTE: Analogous to SWR above, building Clover is quite slow.
-        - LABEL="make Gallium ST Clover"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=3.6
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - OVERRIDE_CC=gcc-4.7
-        - OVERRIDE_CXX=g++-4.7
-        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
-        - DRI_DRIVERS=""
-        - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
-        # i915 most likely doesn't work with OpenCL.
-        # Regardless - we're doing a quick build test here.
-        - GALLIUM_DRIVERS="i915"
-        - VULKAN_DRIVERS=""
-        - LIBUNWIND_FLAGS="--enable-libunwind"
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-3.6
-          packages:
-            - libclc-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - g++-4.7
-            # From sources above
-            - llvm-3.6-dev
-            - clang-3.6
-            - libclang-3.6-dev
-            # Common
-            - xz-utils
-            - x11proto-xf86vidmode-dev
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-    - env:
-        # NOTE: Analogous to SWR above, building Clover is quite slow.
         - LABEL="make Gallium ST Clover LLVM-3.9"
         - BUILD=make
         - MAKEFLAGS="-j4"
diff --git a/configure.ac b/configure.ac
index 3fb3256181..ac641e6536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ ZLIB_REQUIRED=1.2.3
 
 dnl LLVM versions
 LLVM_REQUIRED_GALLIUM=3.3.0
-LLVM_REQUIRED_OPENCL=3.6.0
+LLVM_REQUIRED_OPENCL=3.9.0
 LLVM_REQUIRED_R600=3.9.0
 LLVM_REQUIRED_RADEONSI=3.9.0
 LLVM_REQUIRED_RADV=3.9.0