<div dir="ltr">On 5 April 2017 at 13:27, Andres Gomez <span dir="ltr"><<a href="mailto:agomez@igalia.com" target="_blank">agomez@igalia.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Trusty's LLVM toochain repository was whitelisted some time ago. See:<br>
<a href="https://github.com/travis-ci/apt-source-whitelist/commit/ebc278924a0b5e282dac685683faf6a318dd424c" rel="noreferrer" target="_blank">https://github.com/travis-ci/<wbr>apt-source-whitelist/commit/<wbr>ebc278924a0b5e282dac685683faf6<wbr>a318dd424c</a><br>
<br>
Signed-off-by: Andres Gomez <<a href="mailto:agomez@igalia.com">agomez@igalia.com</a>><br>
Cc: Rhys Kidd <<a href="mailto:rhyskidd@gmail.com">rhyskidd@gmail.com</a>><br>
Cc: Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>><br></blockquote><div><br></div><div>With the link in the commit message pointing to the Trusty change [0], this gets my:<br></div><div><br><span class="gmail-il">Reviewed</span>-<span class="gmail-il">by</span>: Rhys Kidd <<a href="mailto:rhyskidd@gmail.com" target="_blank">rhyskidd@gmail.com</a>><br><br>[0] <a href="https://github.com/travis-ci/apt-source-whitelist/commit/479067c5e74cb0c1e2419209179b1afe2edce274">https://github.com/travis-ci/apt-source-whitelist/commit/479067c5e74cb0c1e2419209179b1afe2edce274</a><br><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
.travis.yml | 15 +++------------<br>
1 file changed, 3 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/.travis.yml b/.travis.yml<br>
index 23c4bb53d75..0667c7488d4 100644<br>
--- a/.travis.yml<br>
+++ b/.travis.yml<br>
@@ -9,14 +9,15 @@ cache:<br>
<br>
addons:<br>
apt:<br>
+ sources:<br>
+ - llvm-toolchain-trusty-3.9<br>
packages:<br>
- libdrm-dev<br>
- x11proto-xf86vidmode-dev<br>
- libexpat1-dev<br>
- libxcb-dri2-0-dev<br>
- libx11-xcb-dev<br>
- # LLVM packaging is broken and misses these dependencies<br>
- - libedit-dev<br>
+ - llvm-3.9-dev<br>
- libelf-dev<br>
- scons<br>
<br>
@@ -35,7 +36,6 @@ env:<br>
- LIBXCB_VERSION=libxcb-1.11<br>
- LIBXSHMFENCE_VERSION=<wbr>libxshmfence-1.2<br>
- LLVM_VERSION=3.9<br>
- - LLVM_PACKAGE="llvm-${LLVM_<wbr>VERSION} llvm-${LLVM_VERSION}-dev"<br>
- LLVM_CONFIG="llvm-config-${<wbr>LLVM_VERSION}"<br>
- PKG_CONFIG_PATH=$HOME/prefix/<wbr>lib/pkgconfig<br>
- MAKEFLAGS=-j2<br>
@@ -100,15 +100,6 @@ install:<br>
- tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2<br>
- (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make install)<br>
<br>
- # Install LLVM directly via apt-get (not Travis-CI's apt addon)<br>
- # See <a href="https://github.com/travis-ci/apt-source-whitelist/pull/205#issuecomment-216054237" rel="noreferrer" target="_blank">https://github.com/travis-ci/<wbr>apt-source-whitelist/pull/205#<wbr>issuecomment-216054237</a><br>
-<br>
- - wget -nv -O - <a href="http://llvm.org/apt/llvm-snapshot.gpg.key" rel="noreferrer" target="_blank">http://llvm.org/apt/llvm-<wbr>snapshot.gpg.key</a> | sudo apt-key add -<br>
- - sudo apt-add-repository -y 'deb <a href="http://llvm.org/apt/trusty" rel="noreferrer" target="_blank">http://llvm.org/apt/trusty</a> llvm-toolchain-trusty-3.9 main'<br>
- - sudo apt-add-repository -y 'deb <a href="http://llvm.org/apt/trusty" rel="noreferrer" target="_blank">http://llvm.org/apt/trusty</a> llvm-toolchain-trusty main'<br>
- - sudo apt-get update -qq<br>
- - sudo apt-get install -qq -y $LLVM_PACKAGE<br>
-<br>
script:<br>
- if test "x$BUILD" = xmake; then<br>
./autogen.sh --enable-debug<br>
<span class="gmail-HOEnZb"><font color="#888888">--<br>
2.11.0<br>
<br>
</font></span></blockquote></div><br></div></div>