From b021e8c1a8d7467f75fec6044c7286a097c250bb Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sun, 3 May 2026 13:01:29 -0500 Subject: [PATCH] fix(zig-master): Use rpm.define() for llvm_compat (#11851) (#11859) (cherry picked from commit a0f1a123471cafeea3c3e29b6924a3472bf0db60) Co-authored-by: Gilver --- anda/langs/zig/bootstrap/update.rhai | 2 +- anda/langs/zig/bootstrap/zig-master-bootstrap.spec | 2 +- anda/langs/zig/master/update.rhai | 2 +- anda/langs/zig/master/zig-master.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/langs/zig/bootstrap/update.rhai b/anda/langs/zig/bootstrap/update.rhai index b8831c70ce..ddbcbc1d86 100644 --- a/anda/langs/zig/bootstrap/update.rhai +++ b/anda/langs/zig/bootstrap/update.rhai @@ -13,5 +13,5 @@ if rpm.changed() { let l = find(`releases\.llvm\.org/download\.html#([\d.]+)`, rawfile, 1); rpm.global("llvm_version", l); l.truncate(2); - rpm.global("llvm_compat", l); + rpm.define("llvm_compat", l); } diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 0d2e08cdf3..cdb58a0680 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -2,7 +2,7 @@ %global zig_arches x86_64 aarch64 riscv64 %{mips64} # Signing key from https://ziglang.org/download/ %global public_key RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U -%if 0%{?fedora} >= 44 +%if 0%{?fedora} >= 46 %define llvm_compat 22 %endif %global llvm_version 22.0.0 diff --git a/anda/langs/zig/master/update.rhai b/anda/langs/zig/master/update.rhai index 0f43f56298..57939139b8 100644 --- a/anda/langs/zig/master/update.rhai +++ b/anda/langs/zig/master/update.rhai @@ -11,5 +11,5 @@ if rpm.changed() { let l = find(`releases\.llvm\.org/download\.html#([\d.]+)`, rawfile, 1); rpm.global("llvm_version", l); l.truncate(2); - rpm.global("llvm_compat", l); + rpm.define("llvm_compat", l); } diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 56fe44fcec..e980008053 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -2,7 +2,7 @@ %global zig_arches x86_64 aarch64 riscv64 %{mips64} # Signing key from https://ziglang.org/download/ %global public_key RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U -%if 0%{?fedora} >= 44 +%if 0%{?fedora} >= 46 %define llvm_compat 22 %endif %global llvm_version 22.0.0