funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 09:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(zig): Port another Fedora patch to fix the runtime GCC dep (#5092) (#5095)

Browse Source 
* Port another Fedora patch to fix the runtime GCC dep

* chore: Bump release

(cherry picked from commit 1560fd625a)

Signed-off-by: RockGrub <RockGrub@users.noreply.github.com>
This commit is contained in:
Gilver
2025-05-28 07:43:42 -05:00
committed by GitHub
parent 7e8bf602e6
commit cc4fe8fd13
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/langs/zig/bootstrap/zig-master-bootstrap.spec
+3 -4
View File
@@ -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}
anda/langs/zig/master/zig-master.spec
+2 -3
View File
@@ -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}