Use gcc-toolset-15 to build, including its gdb for testing
Resolves: RHEL-141249
This commit is contained in:
parent
169d25e138
commit
32260978c6
18
rust.spec
18
rust.spec
@ -1,6 +1,6 @@
|
||||
Name: rust
|
||||
Version: 1.96.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0)
|
||||
# ^ written as: (rust itself) and (bundled libraries)
|
||||
@ -250,11 +250,12 @@ BuildRequires: gpgverify
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-toolset-14-annobin-plugin-gcc
|
||||
BuildRequires: gcc-toolset-14-gcc-plugin-annobin
|
||||
BuildRequires: gcc-toolset-14-binutils
|
||||
BuildRequires: gcc-toolset-14-gcc
|
||||
BuildRequires: gcc-toolset-14-gcc-c++
|
||||
BuildRequires: gcc-toolset-15-annobin-plugin-gcc
|
||||
BuildRequires: gcc-toolset-15-gcc-plugin-annobin
|
||||
BuildRequires: gcc-toolset-15-binutils
|
||||
BuildRequires: gcc-toolset-15-gcc
|
||||
BuildRequires: gcc-toolset-15-gcc-c++
|
||||
BuildRequires: gcc-toolset-15-gdb
|
||||
BuildRequires: ncurses-devel
|
||||
# explicit curl-devel to avoid httpd24-curl (rhbz1540167)
|
||||
BuildRequires: curl-devel
|
||||
@ -792,7 +793,7 @@ end}
|
||||
%{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
|
||||
%{?llvm_path:PATH="%{llvm_path}:$PATH"}
|
||||
}
|
||||
%global export_rust_env export %{rust_env} ; source /opt/rh/gcc-toolset-14/enable
|
||||
%global export_rust_env export %{rust_env} ; source /opt/rh/gcc-toolset-15/enable
|
||||
|
||||
%build
|
||||
%{export_rust_env}
|
||||
@ -1260,6 +1261,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 08 2026 Josh Stone <jistone@redhat.com> - 1.96.0-2
|
||||
- Use gcc-toolset-15 to build, including its gdb for testing
|
||||
|
||||
* Thu Jun 04 2026 Josh Stone <jistone@redhat.com> - 1.96.0-1
|
||||
- Update to 1.96.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user