diff options
| author | Juan A. Suarez Romero <jasuarez@igalia.com> | 2018-08-21 12:34:48 +0200 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2018-08-22 17:29:20 +0200 |
| commit | 6ea5718318834cb3b7972d1e38ddd7bbeff36f08 (patch) | |
| tree | a878c522661f6f13d1c9f6d258f7201d4e1b488c /.travis.yml | |
| parent | 4c43ec461de4f122d5d6566361d064c816e4ef69 (diff) | |
| download | mesa-6ea5718318834cb3b7972d1e38ddd7bbeff36f08.tar.gz mesa-6ea5718318834cb3b7972d1e38ddd7bbeff36f08.tar.bz2 mesa-6ea5718318834cb3b7972d1e38ddd7bbeff36f08.zip | |
travis: SWR requires LLVM 6.0
v2: update clarification why ubuntu-toolchain-r-test is required (Emil)
Fixes: 0cef0cccf51 ("swr: bump minimum supported LLVM version to 6.0")
Cc: Dylan Baker <dylan@pnwbakers.com>
Cc: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/.travis.yml b/.travis.yml index 32cd8602e6f..90f9ec40e12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: # From sources above @@ -98,10 +98,8 @@ matrix: - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=5.0 + - LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - OVERRIDE_CC="gcc-4.8" - - OVERRIDE_CXX="g++-4.8" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" @@ -111,12 +109,12 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-trusty-6.0 + # llvm-6 requires libstdc++4.9 which is not in main repo + - ubuntu-toolchain-r-test packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev # From sources above - - llvm-5.0-dev + - llvm-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev @@ -141,7 +139,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: # From sources above @@ -314,7 +312,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: - libclc-dev @@ -382,7 +380,7 @@ matrix: apt: sources: - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo + # llvm-6 requires libstdc++4.9 which is not in main repo - ubuntu-toolchain-r-test packages: # From sources above @@ -436,21 +434,19 @@ matrix: - BUILD=scons - SCONSFLAGS="-j4" - SCONS_TARGET="swr=1" - - LLVM_VERSION=5.0 + - LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" # Keep it symmetrical to the make build. There's no actual SWR, yet. - SCONS_CHECK_COMMAND="true" - - OVERRIDE_CC="gcc-4.8" - - OVERRIDE_CXX="g++-4.8" addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - llvm-toolchain-trusty-6.0 + # llvm-6 requires libstdc++4.9 which is not in main repo + - ubuntu-toolchain-r-test packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev # From sources above - - llvm-5.0-dev + - llvm-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev |