From 88b8d72234cb6b75d3d102d3ef036060ca8c7b54 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david@ixit.cz>
Date: Fri, 2 Aug 2024 14:55:56 +0900
Subject: [PATCH] ci/alpine: use llvm variables

Fixes: da391650f534 ("ci: build a host version of mesa for cross builds")

Reviewed-by: Eric Engestrom <eric@igalia.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30482>
(cherry picked from commit 34753cefd828f5db8e9e14cee9c4e45cee5baaaa)
---
 .gitlab-ci/container/alpine/x86_64_build.sh | 6 +++---
 .pick_status.json                           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/container/alpine/x86_64_build.sh b/.gitlab-ci/container/alpine/x86_64_build.sh
index 1c9ec1f0a24..eb5bfa711e8 100644
--- a/.gitlab-ci/container/alpine/x86_64_build.sh
+++ b/.gitlab-ci/container/alpine/x86_64_build.sh
@@ -18,7 +18,7 @@ DEPS=(
     bash
     bison
     ccache
-    clang16-dev
+    clang${LLVM_VERSION}-dev
     cmake
     clang-dev
     coreutils
@@ -31,8 +31,8 @@ DEPS=(
     glslang
     graphviz
     linux-headers
-    llvm16-static
-    llvm16-dev
+    llvm${LLVM_VERSION}-static
+    llvm${LLVM_VERSION}-dev
     meson
     mold
     musl-dev
diff --git a/.pick_status.json b/.pick_status.json
index c6219130192..d27cd0270dc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1474,7 +1474,7 @@
         "description": "ci/alpine: use llvm variables",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "da391650f534cc78c4907010010a475a72e49422",
         "notes": null