From: Michel Dänzer <mdaenzer@redhat.com>
Date: Tue, 8 Oct 2019 17:48:41 +0000 (+0200)
Subject: gitlab-ci: Enable llvmpipe in ARM build jobs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=793f6b30d9ec4bc8d4d1ab3bdb429acb7f7f3a20;p=mesa.git

gitlab-ci: Enable llvmpipe in ARM build jobs

v2:
* Use LLVM 8 from buster-backports
v3:
* Use LLVM 7 again for armhf, llvmpipe is still broken there with LLVM 8

Acked-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cde2945b58..d534345a4d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,14 +202,13 @@ meson-main:
       -D gallium-va=false
       -D gallium-xa=false
       -D gallium-nine=false
-      -D llvm=false
 
 .meson-arm:
   extends: .meson-cross
   image: $DEBIAN_ARM64_IMAGE
   variables:
     VULKAN_DRIVERS: freedreno
-    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
+    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,swrast,tegra,v3d,vc4"
     EXTRA_OPTION: >
       -D I-love-half-baked-turnips=true
   needs:
@@ -221,6 +220,7 @@ meson-armhf:
   extends: .meson-arm
   variables:
     CROSS: armhf
+    LLVM_VERSION: "7"
 
 meson-arm64:
   extends:
diff --git a/.gitlab-ci/debian-arm64-install.sh b/.gitlab-ci/debian-arm64-install.sh
index 1dac7b99593..40edd783a30 100644
--- a/.gitlab-ci/debian-arm64-install.sh
+++ b/.gitlab-ci/debian-arm64-install.sh
@@ -6,6 +6,7 @@ set -o xtrace
 ############### Install packages for building
 apt-get -y install ca-certificates
 sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
+echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
 dpkg --add-architecture armhf
 apt-get update
 apt-get -y install \
@@ -30,6 +31,8 @@ apt-get -y install \
 	libgles2-mesa-dev \
 	libpng-dev \
 	libssl-dev \
+	llvm-7-dev:armhf \
+	llvm-8-dev \
 	meson \
 	ninja-build \
 	pkg-config \