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

Resolves: RHEL-170365
This commit is contained in:
Nick Clifton 2026-08-06 08:40:12 +01:00 committed by Miloš Prchlík
parent 896564c6a1
commit 7c0a344904

View File

@ -27,7 +27,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: 1%{?dist}
Release: 2%{?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
@ -162,7 +162,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------------------------------------------------
@ -381,6 +381,11 @@ 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 %{with clang}
BuildRequires: clang compiler-rt
@ -509,8 +514,13 @@ BuildRequires: libzstd-devel
Requires: (%{?scl_prefix}runtime >= %{gts_ver} with %{?scl_prefix}runtime < %{gts_next})
%endif
%if %{bootstrapping}
%define alternatives_cmd /usr/sbin/alternatives
%define alternatives_cmdline %{alternatives_cmd}
%else
%define alternatives_cmd %{!?scl:%{_sbindir}}%{?scl:%{_root_sbindir}}/alternatives
%define alternatives_cmdline %{alternatives_cmd}%{?scl: --altdir %{_sysconfdir}/alternatives --admindir %{_scl_root}/var/lib/alternatives}
%endif
Requires(post): %{alternatives_cmd}
Requires(preun): %{alternatives_cmd}
@ -1367,8 +1377,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
#----------------------------------------------------------------------------
@ -1533,9 +1545,11 @@ exit 0
%endif
%if %have_scl_utils == 0
%if ! %{bootstrapping}
%dir %{_scl_root}/etc/alternatives
%dir %{_scl_root}/var/lib/alternatives
%endif
%endif
#------------------------------------
@ -1570,7 +1584,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.*
@ -1617,6 +1635,9 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Thu Aug 06 2026 Nick Clifton <nickc@redhat.com> - 2.46-2
- Disable bootstrapping mode. Add build requirement for libatomic-devel. (RHEL-208909)
* Thu Jun 17 2026 Nick Clifton <nickc@redhat.com> - 2.46-1
- Initial commit on c9s. (RHEL-170365)
- Resolves: RHEL-170365