Mesa (master): travis: add ubuntu-toolchain-r-test

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 80f937ea4db301f5cf53691532a65a8c660e57d4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80f937ea4db301f5cf53691532a65a8c660e57d4

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Mon Aug  6 12:12:09 2018 +0200

travis: add ubuntu-toolchain-r-test

LLVM 6.0 requires libstc++4.9, which is not available in main Travis
repository.

v2: LLVM 6.0 requires libstdc+4.9, rather than GCC 4.9 (Jan Vesely)

Fixes: fd1121e8399 ("amd: remove support for LLVM 5.0")
CC: Marek Olšák <marek.olsak at amd.com>
CC: Emil Velikov <emil.velikov at collabora.com>
CC: Dylan Baker <dylan at pnwbakers.com>
Reviewed-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f7cb85942d..9e45eca8d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,6 +137,8 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
+            # llvm-6 depends on gcc-4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
             # LLVM packaging is broken and misses these dependencies
             - libedit-dev
@@ -378,6 +380,8 @@ matrix:
         apt:
           sources:
             - llvm-toolchain-trusty-6.0
+            # llvm-6 depends on gcc-4.9 which is not in main repo
+            - ubuntu-toolchain-r-test
           packages:
             # LLVM packaging is broken and misses these dependencies
             - libedit-dev