Trusty's LLVM toochain repository was whitelisted some time ago. See:
https://github.com/travis-ci/apt-source-whitelist/commit/479067c5e74cb0c1e2419209179b1afe2edce274
Signed-off-by: Andres Gomez <ago...@igalia.com>
Cc: Rhys Kidd <rhysk...@gmail.com>
Cc: Emil Velikov <emil.l.veli...@gmail.com>
Reviewed-by: Rhys Kidd <rhysk...@gmail.com>
---
.travis.yml | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 23c4bb53d7..0667c7488d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,15 @@ cache:
addons:
apt:
+ sources:
+ - llvm-toolchain-trusty-3.9
packages:
- libdrm-dev
- x11proto-xf86vidmode-dev
- libexpat1-dev
- libxcb-dri2-0-dev
- libx11-xcb-dev
- # LLVM packaging is broken and misses these dependencies
- - libedit-dev
+ - llvm-3.9-dev
- libelf-dev
- scons
@@ -35,7 +36,6 @@ env:
- LIBXCB_VERSION=libxcb-1.11
- LIBXSHMFENCE_VERSION=libxshmfence-1.2
- LLVM_VERSION=3.9
- - LLVM_PACKAGE="llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev"
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
- MAKEFLAGS=-j2
@@ -100,15 +100,6 @@ install:
- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
- (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make
install)
- # Install LLVM directly via apt-get (not Travis-CI's apt addon)
- # See
https://github.com/travis-ci/apt-source-whitelist/pull/205#issuecomment-216054237
-
- - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add
-
- - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty
llvm-toolchain-trusty-3.9 main'
- - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty
llvm-toolchain-trusty main'
- - sudo apt-get update -qq
- - sudo apt-get install -qq -y $LLVM_PACKAGE
-
script:
- if test "x$BUILD" = xmake; then
./autogen.sh --enable-debug
--
2.11.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
