Enable profiler_builtins for EPEL7
This commit is contained in:
parent
d6049d32fe
commit
7ada663ebd
1 changed files with 11 additions and 4 deletions
15
rust.spec
15
rust.spec
|
|
@ -85,7 +85,7 @@
|
|||
|
||||
Name: rust
|
||||
Version: 1.72.1
|
||||
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-DFS-2016)
|
||||
# ^ written as: (rust itself) and (bundled libraries)
|
||||
|
|
@ -275,7 +275,7 @@ Requires: %{name}-std-static%{?_isa} = %{version}-%{release}
|
|||
Requires: /usr/bin/cc
|
||||
|
||||
%if 0%{?epel} == 7
|
||||
%global devtoolset_name devtoolset-11
|
||||
%global devtoolset_name devtoolset-12
|
||||
BuildRequires: %{devtoolset_name}-binutils
|
||||
BuildRequires: %{devtoolset_name}-gcc
|
||||
BuildRequires: %{devtoolset_name}-gcc-c++
|
||||
|
|
@ -340,9 +340,11 @@ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)'
|
|||
%{nil}
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
# For profiler_builtins
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
BuildRequires: compiler-rt
|
||||
%else
|
||||
BuildRequires: llvm-toolset-14.0-compiler-rt
|
||||
%endif
|
||||
|
||||
# This component was removed as of Rust 1.69.0.
|
||||
|
|
@ -759,10 +761,12 @@ end}
|
|||
end}
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
# The exact profiler path is version dependent, and uses LLVM-specific
|
||||
# arch names in the filename, but this find is good enough for now...
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
PROFILER=$(find %{_libdir}/clang -type f -name 'libclang_rt.profile-*.a')
|
||||
%else
|
||||
PROFILER=$(find /opt/rh/llvm-toolset-14.0/root/%{_libdir}/clang -type f -name 'libclang_rt.profile-*.a')
|
||||
%endif
|
||||
|
||||
%configure --disable-option-checking \
|
||||
|
|
@ -1088,6 +1092,9 @@ end}
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Jan 21 2024 Than Ngo <than@redhat.com> - 1.72.1-2
|
||||
- Enable profiler_builtins for EPEL7
|
||||
|
||||
* Tue Sep 19 2023 Josh Stone <jistone@redhat.com> - 1.72.1-1
|
||||
- Update to 1.72.1.
|
||||
- Migrated to SPDX license
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue