autotools: use correct gl.pc LIBS when using glvnd

[mesa.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9e45eca8d644e8f41bb86d04ce167de735ffd502..9f91d2c9b6955e33bdd5734af48dae5697a56c02 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,17 +36,17 @@ matrix:
         - LABEL="meson Vulkan"
         - BUILD=meson
         - MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]"
-        - LLVM_VERSION=5.0
+        - LLVM_VERSION=6.0
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
       addons:
         apt:
           sources:
-            - llvm-toolchain-trusty-5.0
+            - 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
             # From sources above
-            - llvm-5.0-dev
+            - llvm-6.0-dev
             # Common
             - xz-utils
             - libexpat1-dev
@@ -140,8 +140,6 @@ matrix:
             # 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
             # From sources above
             - llvm-6.0-dev
             # Common
@@ -383,8 +381,6 @@ matrix:
             # 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
             # From sources above
             - llvm-6.0-dev
             # Common