commit 7362176cfe47bc372caca1e90c85bb8758f42687
author Samuel Pitoiset <samuel.pitoiset@gmail.com> Tue Nov 19 14:37:32 2019 +0100
committer Samuel Pitoiset <samuel.pitoiset@gmail.com> Thu Nov 21 09:35:05 2019 +0100
tree 3a1a4050929ffaef1f3ffd859ac7d1725f25f784
parent e6d26d77a3271b788383d10230e3a9fe33a3fe70

gitlab-ci: build GLVND in meson-clang

Building GLVND in meson-main doesn't work because this disables
libEGL and it's needed for running shader-db.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f742d4..9c0612a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -318,7 +318,6 @@
   variables:
     UNWIND: "true"
     DRI_LOADERS: >
-      -D glvnd=true
       -D egl=true
     GALLIUM_ST: >
       -D dri3=true
@@ -336,6 +335,8 @@
   extends: .meson-build
   variables:
     UNWIND: "true"
+    DRI_LOADERS: >
+      -D glvnd=true
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "auto"
     VULKAN_DRIVERS: intel,amd,freedreno