From 0ceb69242985ca299be271ecdfeea65c26873471 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 11 Jan 2024 13:01:16 +0000 Subject: [PATCH] Spec File: Do not use of the system zlib by default. Spec File: Do not check the mtime of ld.bfd. Resolves: RHEL-19373 Resolves: RHEL-21303 --- binutils.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/binutils.spec b/binutils.spec index 42f7005..5e19b68 100644 --- a/binutils.spec +++ b/binutils.spec @@ -9,7 +9,7 @@ BuildRequires: scl-utils-build Summary: A GNU collection of binary utilities Name: %{?scl_prefix}binutils Version: 2.40 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -26,7 +26,7 @@ URL: https://sourceware.org/binutils # --without docs Skip building documentation. Default is with docs, except when building a cross binutils. # --without gold Disable building of the GOLD linker. # --without gprofng Do not build the GprofNG profiler. -# --without systemzlib Use the binutils version of zlib. +# --with systemzlib Use the binutils version of zlib. # --without testsuite Do not run the testsuite. Default is to run it. # Other configuration options can be set by modifying the following defines. @@ -95,9 +95,9 @@ URL: https://sourceware.org/binutils %bcond_without debuginfod # Default: build binutils-gprofng package. %bcond_without gprofng -# Use the system supplied version of the zlib compress library. +# Default: Do not use the system supplied version of the zlib compression library. # Change this to use the binutils builtin version instead. -%bcond_without systemzlib +%bcond_with systemzlib # Allow the user to override the compiler used to build the binutils. # The default build compiler is gcc if %%toolchain is not clang. @@ -1190,9 +1190,10 @@ exit 0 %license COPYING COPYING3 COPYING3.LIB COPYING.LIB %doc README %{_bindir}/[!l]* -# %%verify(symlink) does not work for some reason, so using "owner" instead. +# %%verify(symlink) is not support in RHEL, so check owner instead. %verify(owner) %{_bindir}/ld -%{_bindir}/ld.bfd +# The mtime check fails for ld.bfd because of the laternatives mechanism, so ignore it. +%verify(owner) %{_bindir}/ld.bfd %if %{with gprofng} %exclude %{_bindir}/gp-* @@ -1285,6 +1286,10 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Thu Jan 11 2024 Nick Clifton - 2.40-17 +- Spec File: Do not use of the system zlib by default. (RHEL-19373) +- Spec File: Do not check the mtime of ld.bfd. (RHEL-21303) + * Tue Dec 12 2023 Nick Clifton - 2.40-16 - Disable building static libraries with LTO. (RHEL-18800)