From cbed5ce1511091f771987632a68ab92eb17c4a66 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Tue, 7 Apr 2026 11:40:19 +0200
Subject: [PATCH] main/devicepkg-dev: support passing LLVM=1 in
 downstreamkernel_prepare

As required by kernels that probably shouldn't be using the
downstreamkernel_* functions in the first place, but we need to fix this
up to unblock linux-postmarketos-allwinner compilation.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8295>
---
 main/devicepkg-dev/APKBUILD                    | 4 ++--
 main/devicepkg-dev/downstreamkernel_prepare.sh | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index dabde6ac1..3e549956b 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,6 +1,6 @@
 maintainer=""
 pkgname=devicepkg-dev
-pkgver=0.22.1
+pkgver=0.22.2
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -76,7 +76,7 @@ sha512sums="
 d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
 1ed82c638bda2c2edff4f2f314b466a3ce0e8a2a33b05e5f31ddc2b06fc06d2d8ea4dca7cc354262ac28402c90ea36d77b0347fafeccee8894c9ff013911a7d1  devicepkg_build.sh
 a2b9848480e3200d2a4053ce18989e5d711b95abf3e383f5ad67bda5e2e5c1d63c1e9b142d6c02be079a8402197a2049e7008aa0cf90a765ed2ca8ed981b1f63  devicepkg_package.sh
-f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6  downstreamkernel_prepare.sh
+6f17b8029e42cba87de156f1adf19b0d939ab1f171868582b11ab983a671cd7c31c4ca6fc85dd33ccfc50170cd1e4dcbd85c88b9a538a3f94e85a87d93c29f1c  downstreamkernel_prepare.sh
 107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe  downstreamkernel_package.sh
 4b807ea2e773a66f699bba9f76fbb6349b0ca6f6fc6d867b540c2327b304f82d57365a0e9f5b7cae30ad5c5990553162152d1947aca5335a53e641b0c6b08ef6  devicepkg_subpackage_kernel.sh
 ca330f9f6771bdb13fe973c9a57a7718958b515e81ddb8a1ce54c4f8c7ef5907c8ab346e7aa1628e237945fccab0b3b70bf782c00ad318f71f0adcd839c1d966  deviceinfo
diff --git a/main/devicepkg-dev/downstreamkernel_prepare.sh b/main/devicepkg-dev/downstreamkernel_prepare.sh
index 74541e559..f7eb46cba 100644
--- a/main/devicepkg-dev/downstreamkernel_prepare.sh
+++ b/main/devicepkg-dev/downstreamkernel_prepare.sh
@@ -36,6 +36,8 @@ fi
 # Set _hostcc when HOSTCC is set
 [ -z "$HOSTCC" ] || _hostcc="HOSTCC=$HOSTCC"
 
+[ -z "$LLVM" ] || _llvm="LLVM=$LLVM"
+
 # Support newer GCC versions
 install_gcc_h
 
@@ -55,4 +57,4 @@ mkdir -p "$builddir/$_outdir"
 cp "$srcdir/$_config" "$builddir"/"$_outdir"/.config
 # shellcheck disable=SC2086,SC2154
 yes "" | make -C "$builddir" ARCH="$_carch" O="$_outdir" \
-	$_hostcc oldconfig
+	$_hostcc $_llvm oldconfig