Disable bootstrapping mode. Add build requirement for libatomic-devel.

Resolves: RHEL-169582
This commit is contained in:
Nick Clifton 2026-08-06 08:26:44 +01:00
parent a34063bce0
commit bdf8520f53

View File

@ -21,7 +21,7 @@ Name: %{?scl_prefix}binutils
# The variable %%{source} (see below) should be set to indicate which of these
# origins is being used.
Version: 2.46
Release: 2%{?dist}
Release: 3%{?dist}
License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later
URL: https://sourceware.org/binutils
@ -156,7 +156,7 @@ URL: https://sourceware.org/binutils
# Bootstrapping: Set this to 1 to build the binutils with the system gcc.
# Then once GTS-gcc is built and in the buildroot, reset this variable
# to 0, bump the NVR and rebuild GTS-binutils.
%define bootstrapping 1
%define bootstrapping 0
#----End of Configure Options------------------------------------------------
@ -384,11 +384,18 @@ BuildRequires: autoconf, automake, perl, sed, coreutils, make
# Bison is used to generate gold/yyscript.c and ld/ldgram.c.
BuildRequires: bison
%if ! %{bootstrapping}
# Libatomic is automatically added to the link command line by GTS-gcc.
BuildRequires: %{?scl_prefix}libatomic-devel
%endif
%if %have_scl_utils
BuildRequires: scl-utils-build
%else
%if ! %{bootstrapping}
BuildRequires: gcc-toolset-%{gts_ver}-devel
%endif
%endif
%if %{with clang}
@ -1387,8 +1394,10 @@ done
export QA_RPATHS=0x0003
%if %have_scl_utils == 0
%if ! %{bootstrapping}
mkdir -p %{buildroot}%{_scl_root}/etc/alternatives %{buildroot}%{_scl_root}/var/lib/alternatives
%endif
%endif
#----------------------------------------------------------------------------
@ -1552,9 +1561,11 @@ exit 0
%endif
%if %have_scl_utils == 0
%if ! %{bootstrapping}
%dir %{_scl_root}/etc/alternatives
%dir %{_scl_root}/var/lib/alternatives
%endif
%endif
#------------------------------------
@ -1589,7 +1600,11 @@ exit 0
%{_bindir}/gprofng-*
%dir %{_libdir}/gprofng
%{_libdir}/gprofng/*
%if %{bootstrapping}
/etc/gprofng.rc
%else
%{_scl_root}/etc/gprofng.rc
%endif
%if %{enable_shared}
%{_libdir}/libgprofng.*
@ -1636,6 +1651,9 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Thu Aug 06 2026 Nick Clifton <nickc@redhat.com> - 2.46-3
- Disable bootstrapping mode. Add build requirement for libatomic-devel. (RHEL-208907)
* Mon Jul 06 2026 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.46-2
- Fix alternatives path when bootstrapping (RHEL-191862)