From: Emil Velikov <emil.veli...@collabora.com>
We'll bump the number in the build systems shortly. Update the travis
file, first, to avoid intermittent failures.
This effectively removes LLVM 3.9 and 4.0 from the build matrix.
Cc: Juan A. Suarez Romero <jasua...@igalia.com>
Cc: Dylan Baker <dy...@pnwbakers.com>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
Gents any idea how to resolve the llvm-config workaround we have for
meson? I could not find anything about an override in the meson docs.
---
.travis.yml | 108 +++++++++++-----------------------------------------
1 file changed, 22 insertions(+), 86 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index dde43b2a171..8370e1e95f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -159,99 +159,26 @@ matrix:
- BUILD=make
- MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=3.9
- - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- # New binutils linker is required for llvm-3.9
- - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
- - 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"
- -
GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,imx"
- - VULKAN_DRIVERS=""
- - LIBUNWIND_FLAGS="--enable-libunwind"
- addons:
- apt:
- sources:
- - llvm-toolchain-trusty-3.9
- packages:
- - binutils-2.26
- # LLVM packaging is broken and misses these dependencies
- - libedit-dev
- # From sources above
- - llvm-3.9-dev
- # Common
- - xz-utils
- - x11proto-xf86vidmode-dev
- - libexpat1-dev
- - libx11-xcb-dev
- - libelf-dev
- - libunwind8-dev
- - env:
- - LABEL="make Gallium ST Clover LLVM-3.9"
- - BUILD=make
- - MAKEFLAGS="-j4"
- - MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=3.9
- - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- - OVERRIDE_CC=gcc-4.7
- - OVERRIDE_CXX=g++-4.7
- # New binutils linker is required for llvm-3.9
- - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
- - 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"
- - GALLIUM_DRIVERS="r600"
- - VULKAN_DRIVERS=""
- - LIBUNWIND_FLAGS="--enable-libunwind"
- addons:
- apt:
- sources:
- - llvm-toolchain-trusty-3.9
- packages:
- - binutils-2.26
- - libclc-dev
- # LLVM packaging is broken and misses these dependencies
- - libedit-dev
- - g++-4.7
- # From sources above
- - llvm-3.9-dev
- - clang-3.9
- - libclang-3.9-dev
- # Common
- - xz-utils
- - x11proto-xf86vidmode-dev
- - libexpat1-dev
- - libx11-xcb-dev
- - libelf-dev
- - libunwind8-dev
- - env:
- - LABEL="make Gallium ST Clover LLVM-4.0"
- - BUILD=make
- - MAKEFLAGS="-j4"
- - MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=4.0
+ - LLVM_VERSION=5.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="--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"
- - GALLIUM_DRIVERS="r600"
+ - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa
--disable-nine --disable-xvmc --disable-vdpau --disable-va
--disable-omx-bellagio --disable-gallium-osmesa"
+ -
GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,imx"
- VULKAN_DRIVERS=""
- LIBUNWIND_FLAGS="--enable-libunwind"
addons:
apt:
sources:
- - llvm-toolchain-trusty-4.0
+ - llvm-toolchain-trusty-5.0
packages:
- - libclc-dev
# LLVM packaging is broken and misses these dependencies
- libedit-dev
- g++-4.8
# From sources above
- - llvm-4.0-dev
- - clang-4.0
- - libclang-4.0-dev
+ - llvm-5.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
@@ -364,8 +291,10 @@ matrix:
- BUILD=make
- MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true"
- - LLVM_VERSION=3.3
+ - LLVM_VERSION=5.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 --enable-xa --enable-nine
--enable-xvmc --enable-vdpau --enable-va --enable-omx-bellagio
--enable-gallium-osmesa"
@@ -377,17 +306,20 @@ matrix:
- LIBUNWIND_FLAGS="--enable-libunwind"
addons:
apt:
+ sources:
+ - llvm-toolchain-trusty-5.0
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 ?
+ # LLVM packaging is broken and misses these dependencies
+ - libedit-dev
+ - g++-4.8
+ # From sources above
+ - llvm-5.0-dev
+ # For the ST
- libxvmc-dev
# Build locally, for now.
#- libvdpau-dev
#- libva-dev
- libomxil-bellagio-dev
- # LLVM packaging is broken and misses these dependencies
- - libedit-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
@@ -447,14 +379,18 @@ matrix:
- SCONS_TARGET="llvm=1"
# Keep it symmetrical to the make build.
- SCONS_CHECK_COMMAND="scons llvm=1 check"
- - LLVM_VERSION=3.3
+ - LLVM_VERSION=5.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
addons:
apt:
+ sources:
+ - llvm-toolchain-trusty-5.0
packages:
# LLVM packaging is broken and misses these dependencies
- libedit-dev
- - llvm-3.3-dev
+ - g++-4.8
+ # From sources above
+ - llvm-5.0-dev
# Common
- xz-utils
- x11proto-xf86vidmode-dev
--
2.19.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
