From 6101b0ae4b43bf1d8fabb992c8aea74773e37a2a Mon Sep 17 00:00:00 2001
From: Janne Grunau <j@jannau.net>
Date: Thu, 24 Apr 2025 20:25:03 +0200
Subject: [PATCH] ci: Switch cross-builds to '-D tools=panfrost'

It is not longer necessary to build the panfrost gallium driver for
panfrost_compile so do not do that.

Backport-to: 25.1
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Signed-off-by: Janne Grunau <j@jannau.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34693>
(cherry picked from commit f6c5f0c19dae04e27d34f7387c0df1f492af8c01)
---
 .gitlab-ci/build/gitlab-ci.yml | 9 ++++++---
 .pick_status.json              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 5cd48e8123a..aec36a761b3 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -178,7 +178,7 @@ debian-testing-msan:
       -D build-tests=false
       -D enable-glcpp-tests=false
       -D gallium-opencl=disabled
-      -D gallium-drivers=panfrost
+      -D gallium-drivers=
       -D vulkan-drivers=
       -D video-codecs=
       -D glx=disabled
@@ -187,6 +187,7 @@ debian-testing-msan:
       -D install-mesa-clc=true
       -D precomp-compiler=enabled
       -D install-precomp-compiler=true
+      -D tools=panfrost
 
 debian-testing-ubsan:
   extends:
@@ -421,7 +422,7 @@ debian-android:
       -D build-tests=false
       -D enable-glcpp-tests=false
       -D gallium-opencl=disabled
-      -D gallium-drivers=panfrost
+      -D gallium-drivers=
       -D vulkan-drivers=
       -D video-codecs=
       -D glx=disabled
@@ -430,6 +431,7 @@ debian-android:
       -D install-mesa-clc=true
       -D precomp-compiler=enabled
       -D install-precomp-compiler=true
+      -D tools=panfrost
     S3_ARTIFACT_NAME: mesa-x86_64-android-${BUILDTYPE}
   script:
     # x86_64 build:
@@ -500,7 +502,7 @@ debian-arm32:
       -D build-tests=false
       -D enable-glcpp-tests=false
       -D gallium-opencl=disabled
-      -D gallium-drivers=panfrost
+      -D gallium-drivers=
       -D vulkan-drivers=
       -D video-codecs=
       -D glx=disabled
@@ -509,6 +511,7 @@ debian-arm32:
       -D install-mesa-clc=true
       -D precomp-compiler=enabled
       -D install-precomp-compiler=true
+      -D tools=panfrost
     S3_ARTIFACT_NAME: mesa-arm32-default-${BUILDTYPE}
     # The strip command segfaults, failing to strip the binary and leaving
     # tempfiles in our artifacts.
diff --git a/.pick_status.json b/.pick_status.json
index c4096e44719..2b5d92a9f0d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -224,7 +224,7 @@
         "description": "ci: Switch cross-builds to '-D tools=panfrost'",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null