From f02d283cbb7412c2de4d3e68cec518b9a62efc9e Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 12 May 2022 10:58:15 +0100 Subject: [PATCH] Fix description of gold subpackage so that it does not include the Requires fields. (#2082919) --- binutils.spec | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/binutils.spec b/binutils.spec index ee26fd5..c87326d 100644 --- a/binutils.spec +++ b/binutils.spec @@ -39,7 +39,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?name_cross}%{?_with_debug:-debug} Version: 2.38 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -385,6 +385,8 @@ of an object or archive file), strings (for listing printable strings from files), strip (for discarding symbols), and addr2line (for converting addresses to file and line). +%{!?ld_bfd_priority: %global ld_bfd_priority 50} + #---------------------------------------------------------------------------- %package devel @@ -395,6 +397,14 @@ Requires: binutils = %{version}-%{release} # BZ 1215242: We need touch... Requires: coreutils +# BZ 1924068. Since applications that use the BFD library are +# required to link against the static version, ensure that it retains +# its debug informnation. +# FIXME: Yes - this is being done twice. I have no idea why this +# second invocation is necessary but if both are not present the +# static archives will be stripped. +%undefine __brp_strip_static_archive + %description devel This package contains BFD and opcodes static and dynamic libraries. @@ -409,14 +419,6 @@ dynamic libraries. Developers starting new projects are strongly encouraged to consider using libelf instead of BFD. -# BZ 1924068. Since applications that use the BFD library are -# required to link against the static version, ensure that it retains -# its debug informnation. -# FIXME: Yes - this is being done twice. I have no idea why this -# second invocation is necessary but if both are not present the -# static archives will be stripped. -%undefine __brp_strip_static_archive - #---------------------------------------------------------------------------- %if %{with gold} @@ -426,13 +428,6 @@ Summary: The GOLD linker, a faster alternative to the BFD linker Provides: gold = %{version}-%{release} Requires: binutils >= %{version} -%description gold -This package provides the GOLD linker, which can be used as an alternative to -the default binutils linker (ld.bfd). The GOLD is generally faster than the -BFD linker, and it supports features such as Identical Code Folding and -Incremental linking. Unfortunately it is not as well maintained as the BFD -linker, and it may become deprecated in the future. - # Gold needs bison in order to build gold/yyscript.c. BuildRequires: bison, m4, gcc-c++ # The GOLD testsuite needs a static libc++ @@ -443,12 +438,17 @@ BuildRequires: gcc-c++ Conflicts: gcc-c++ < 4.0.0 %endif -# The higher of these two numbers determines the default ld. +# If ld_gold_priority is higher than ld_bfd_priority then it will be the default linker. %{!?ld_gold_priority:%global ld_gold_priority 30} -%endif +%description gold +This package provides the GOLD linker, which can be used as an alternative to +the default binutils linker (ld.bfd). The GOLD is generally faster than the +BFD linker, and it supports features such as Identical Code Folding and +Incremental linking. Unfortunately it is not as well maintained as the BFD +linker, and it may become deprecated in the future. -%{!?ld_bfd_priority: %global ld_bfd_priority 50} +%endif #---------------------------------------------------------------------------- @@ -916,6 +916,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Thu May 12 2022 Nick Clifton - 2.38-9 +- Fix description of gold subpackage so that it does not include the Requires fields. (#2082919) + * Mon Apr 04 2022 Nick Clifton - 2.38-8 - Fix linker testsuite failures.