summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGert Wollny <[email protected]>2017-09-14 12:27:41 +0200
committerEmil Velikov <[email protected]>2017-09-15 13:56:28 +0100
commitd3675812b53ae5583d693859c4973ccca9a9fb2e (patch)
tree0ff7fea54b7644150572087484bb3af5d0343ee6
parentc75d78161046f34350467b53054ff4e9da7a5cdd (diff)
travis: force llvm-3.3 for "make Gallium ST Other"
In Ubuntu Trusty the default version of llvm is 3.4 and the build was actually randomly picking 3.5 or 3.9. Adding libunwind would then result is build success or failure depending of what version was picked. Install the llvm-3.3-dev package and force its use: On one hand it is the minimum required version we want to the build test against, and on the other hand forcing the version stabilizes the build. Cc: [email protected] Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 246ad30eff4..4f7e0f5f1c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,6 +149,8 @@ matrix:
- BUILD=make
- MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true"
+ - LLVM_VERSION=3.3
+ - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
- DRI_DRIVERS=""
- GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx --enable-gallium-osmesa"
@@ -160,6 +162,8 @@ matrix:
addons:
apt:
packages:
+ # We actually want to test against llvm-3.3
+ - llvm-3.3-dev
# Nine requires gcc 4.6... which is the one we have right ?
- libxvmc-dev
# Build locally, for now.