Enable profiler_builtins for EPEL7

This reverts commit 93ecbc5a13,
reintroducing the workaround for rust#40717, now rust#68714.

.gitignore

@@ -33,6 +33,8 @@
 /rustc-1.14.0-powerpc64-unknown-linux-gnu.tar.gz
 /rustc-1.14.0-s390x-unknown-linux-gnu.tar.gz
 /rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz
+/rustc-1.15.0-powerpc64-unknown-linux-gnu.tar.gz
+/rustc-1.15.0-powerpc64le-unknown-linux-gnu.tar.gz
 /rust-1.15.1-aarch64-unknown-linux-gnu.tar.gz
 /rust-1.15.1-armv7-unknown-linux-gnueabihf.tar.gz
 /rust-1.15.1-i686-unknown-linux-gnu.tar.gz

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
@@ -1336,6 +1343,9 @@ end}
 * Thu Jun 04 2020 Josh Stone <jistone@redhat.com> - 1.44.0-1
 - Update to 1.44.0.
 
+* Tue May 19 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1.1
+- Rebuild with LLVM 9.
+
 * Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
 - Update to 1.43.1.
 
@@ -1378,6 +1388,7 @@ end}
 
 * Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
 - Update to 1.37.0.
+- Disable HTTP/2 support, lacking in system libcurl.
 
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
@@ -1394,12 +1405,6 @@ end}
 * Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
 - Update to 1.34.2 -- fixes CVE-2019-12083.
 
-* Tue Apr 30 2019 Josh Stone <jistone@redhat.com> - 1.34.1-3
-- Set rust.codegen-units-std=1
-
-* Fri Apr 26 2019 Josh Stone <jistone@redhat.com> - 1.34.1-2
-- Remove the ThinLTO workaround.
-
 * Thu Apr 25 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
 - Update to 1.34.1.
 - Add a ThinLTO fix for rhbz1701339.
@@ -1429,14 +1434,12 @@ end}
 * Thu Nov 08 2018 Josh Stone <jistone@redhat.com> - 1.30.1-7
 - Update to 1.30.1.
 
-* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.30.0-6
-- Update to 1.30.0.
-
-* Mon Oct 22 2018 Josh Stone <jistone@redhat.com> - 1.29.2-5
+* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.30.0-6.1
 - Rebuild without bootstrap binaries.
 
-* Sat Oct 20 2018 Josh Stone <jistone@redhat.com> - 1.29.2-4
-- Re-bootstrap armv7hl due to rhbz#1639485
+* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.30.0-6
+- Update to 1.30.0.
+- Re-bootstrap ppc64le for rust#54545
 
 * Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.29.2-3
 - Update to 1.29.2.
@@ -1449,21 +1452,12 @@ end}
 - Update to 1.29.0.
 - Add a clippy-preview subpackage
 
-* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.28.0-3
-- Use llvm6.0 instead of llvm-7 for now
-
-* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.28.0-2
-- Rebuild for LLVM ppc64/s390x fixes
-
-* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
+* Wed Aug 08 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
 - Update to 1.28.0.
 
-* Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-4
+* Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-3
 - Update to 1.27.2.
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.27.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
 - Update to 1.27.1.
 - Security fix for CVE-2018-1000622
@@ -1471,12 +1465,8 @@ end}
 * Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
 - Update to 1.27.0.
 
-* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
-- Rebuild without bootstrap binaries.
-
-* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
+* Wed Jun 06 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
 - Update to 1.26.2.
-- Re-bootstrap to deal with LLVM symbol changes.
 
 * Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
 - Update to 1.26.1.
@@ -1534,15 +1524,6 @@ end}
 - Update to 1.20.0.
 - Add a rust-src subpackage.
 
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 24 2017 Josh Stone <jistone@redhat.com> - 1.19.0-2
-- Use find-debuginfo.sh --keep-section .rustc
-
 * Thu Jul 20 2017 Josh Stone <jistone@redhat.com> - 1.19.0-1
 - Update to 1.19.0.
 
@@ -1555,31 +1536,25 @@ end}
 * Thu Apr 27 2017 Josh Stone <jistone@redhat.com> - 1.17.0-1
 - Update to 1.17.0.
 
-* Mon Mar 20 2017 Josh Stone <jistone@redhat.com> - 1.16.0-3
-- Make rust-lldb arch-specific to deal with lldb deps
-
-* Fri Mar 17 2017 Josh Stone <jistone@redhat.com> - 1.16.0-2
-- Limit rust-lldb arches
-
 * Thu Mar 16 2017 Josh Stone <jistone@redhat.com> - 1.16.0-1
 - Update to 1.16.0.
 - Use rustbuild instead of the old makefiles.
 - Update bootstrapping to include rust-std and cargo.
 - Add a rust-lldb subpackage.
 
-* Thu Feb 09 2017 Josh Stone <jistone@redhat.com> - 1.15.1-1
+* Fri Feb 10 2017 Josh Stone <jistone@redhat.com> - 1.15.1-2
+- Rebuild without bootstrap binaries.
+
+* Fri Feb 10 2017 Josh Stone <jistone@redhat.com> - 1.15.1-1
 - Update to 1.15.1.
 - Require rust-rpm-macros for new crate packaging.
 - Keep shared libraries under rustlib/, only debug-stripped.
 - Merge and clean up conditionals for epel7.
+- Bootstrap ppc64 and ppc64le.
 
-* Fri Dec 23 2016 Josh Stone <jistone@redhat.com> - 1.14.0-2
-- Rebuild without bootstrap binaries.
-
-* Thu Dec 22 2016 Josh Stone <jistone@redhat.com> - 1.14.0-1
+* Tue Jan 03 2017 Josh Stone <jistone@redhat.com> - 1.14.0-1
 - Update to 1.14.0.
 - Rewrite bootstrap logic to target specific arches.
-- Bootstrap ppc64, ppc64le, s390x. (thanks to Sinny Kumari for testing!)
 
 * Thu Nov 10 2016 Josh Stone <jistone@redhat.com> - 1.13.0-1
 - Update to 1.13.0.
@@ -1587,36 +1562,19 @@ end}
 - Split the standard library into its own package
 - Centralize rustlib/ under /usr/lib/ for multilib integration.
 
-* Thu Oct 20 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1
-- Update to 1.12.1.
-
-* Fri Oct 14 2016 Josh Stone <jistone@redhat.com> - 1.12.0-7
-- Rebuild with LLVM 3.9.
-- Add ncurses-devel for llvm-config's -ltinfo.
-
-* Thu Oct 13 2016 Josh Stone <jistone@redhat.com> - 1.12.0-6
-- Rebuild with llvm-static, preparing for 3.9
-
-* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-5
-- Rebuild with fixed eu-strip (rhbz1380961)
-
-* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-4
+* Sat Oct 22 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1.1
 - Rebuild without bootstrap binaries.
 
-* Thu Oct 06 2016 Josh Stone <jistone@redhat.com> - 1.12.0-3
+* Sat Oct 22 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1
+- Update to 1.12.1.
+- Merge package changes from rawhide.
 - Bootstrap aarch64.
-- Use jemalloc's MALLOC_CONF to work around #36944.
-- Apply pr36933 to really disable armv7hl NEON.
 
-* Sat Oct 01 2016 Josh Stone <jistone@redhat.com> - 1.12.0-2
-- Protect .rustc from rpm stripping.
+* Tue Sep 20 2016 Josh Stone <jistone@redhat.com> - 1.11.0-3.2
+- Rebuild without bootstrap binaries.
 
-* Fri Sep 30 2016 Josh Stone <jistone@redhat.com> - 1.12.0-1
-- Update to 1.12.0.
-- Always use --local-rust-root, even for bootstrap binaries.
-- Remove the rebuild conditional - the build system now figures it out.
-- Let minidebuginfo do its thing, since metadata is no longer a note.
-- Let rust build its own compiler-rt builtins again.
+* Mon Sep 19 2016 Josh Stone <jistone@redhat.com> - 1.11.0-3.1
+- Bootstrap el7, with bundled llvm
 
 * Sat Sep 03 2016 Josh Stone <jistone@redhat.com> - 1.11.0-3
 - Rebuild without bootstrap binaries.