From cc4fe8fd13d9e214caceb90e92c96a4f0df112f5 Mon Sep 17 00:00:00 2001 From: Gilver Date: Wed, 28 May 2025 07:43:42 -0500 Subject: [PATCH] fix(zig): Port another Fedora patch to fix the runtime GCC dep (#5092) (#5095) * Port another Fedora patch to fix the runtime GCC dep * chore: Bump release (cherry picked from commit 1560fd625a34654a73b65e3e06d5e396e79a75ad) Signed-off-by: RockGrub --- anda/langs/zig/bootstrap/zig-master-bootstrap.spec | 7 +++---- anda/langs/zig/master/zig-master.spec | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec index 10df165cbb..d2c040a200 100644 --- a/anda/langs/zig/bootstrap/zig-master-bootstrap.spec +++ b/anda/langs/zig/bootstrap/zig-master-bootstrap.spec @@ -39,7 +39,7 @@ Name: zig-master-bootstrap Version: %(echo %{ver} | sed 's/-/~/g') -Release: 1%?dist +Release: 2%?dist Summary: Boostrap builds for Zig. License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 URL: https://ziglang.org @@ -48,6 +48,7 @@ Source1: %{url}/builds/zig-%{ver}.tar.xz.minisig Patch0: 0000-remove-native-lib-directories-from-rpath.patch Patch1: 0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch Patch2: 0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch +Patch3: https://src.fedoraproject.org/rpms/zig/raw/rawhide/f/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -61,14 +62,12 @@ BuildRequires: help2man # for signature verification BuildRequires: minisign %if %{without bootstrap} -BuildRequires: %{name} <= %{version} +BuildRequires: %{name} = %{version} %endif %if %{with test} BuildRequires: elfutils-libelf-devel BuildRequires: libstdc++-static %endif -# Zig invokes the C compiler to figure out system info -Requires: gcc Requires: %{name}-libs = %{version} # Apache-2.0 WITH LLVM-exception OR NCSA OR MIT Provides: bundled(compiler-rt) = %{llvm_version} diff --git a/anda/langs/zig/master/zig-master.spec b/anda/langs/zig/master/zig-master.spec index 8655ab424f..2fcce50e9f 100644 --- a/anda/langs/zig/master/zig-master.spec +++ b/anda/langs/zig/master/zig-master.spec @@ -13,7 +13,7 @@ %global zig_cache_dir %{builddir}/zig-cache Name: zig-master -Version: 0.15.0~dev.565+8e72a2528 +Version: 0.15.0~dev.646+ef35c3d5f Release: 2%?dist Summary: Master builds of the Zig language License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1 @@ -23,6 +23,7 @@ Source1: %{url}/builds/zig-%{version_no_tilde}.tar.xz.minisig Patch0: 0000-remove-native-lib-directories-from-rpath.patch Patch1: 0001-increase-upper-bounds-of-main-zig-executable-to-10G.patch Patch2: 0002-build-pass-zig-lib-dir-as-directory-instead-of-as-st.patch +Patch3: https://src.fedoraproject.org/rpms/zig/raw/rawhide/f/0005-link.Elf-add-root-directory-of-libraries-to-linker-p.patch BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -44,8 +45,6 @@ BuildRequires: libstdc++-static %endif # For the version_no_tilde macro BuildRequires: rust-srpm-macros -# Zig invokes the C compiler to figure out system info -Requires: gcc Requires: %{name}-libs = %{version} # Apache-2.0 WITH LLVM-exception OR NCSA OR MIT Provides: bundled(compiler-rt) = %{llvm_version}