Fix building with documentation disabled.

Resolves: RHEL-44615
This commit is contained in:
Nick Clifton 2024-06-24 12:53:55 +01:00
parent b2f9df48ed
commit dbdaab8874
2 changed files with 12 additions and 12 deletions

View File

@ -1336,7 +1336,7 @@ diff -rupN binutils.orig/ld/scripttempl/elf.sc binutils-2.41/ld/scripttempl/elf.
+ *ro*textonly*) + *ro*textonly*)
+ ALL_TEXT_BEFORE_RO=" " + ALL_TEXT_BEFORE_RO=" "
+ SEPARATE_TEXT=" " + SEPARATE_TEXT=" "
+ TEXT_SEGMENT_ALIGN= + TEXT_SEGMENT_ALIGN=". = ALIGN(${MAXPAGESIZE});"
+ ;; + ;;
*textonly*) *textonly*)
SEPARATE_TEXT=" " SEPARATE_TEXT=" "

View File

@ -2,7 +2,7 @@
Summary: A GNU collection of binary utilities Summary: A GNU collection of binary utilities
Name: binutils%{?_with_debug:-debug} Name: binutils%{?_with_debug:-debug}
Version: 2.41 Version: 2.41
Release: 43%{?dist} Release: 44%{?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 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 URL: https://sourceware.org/binutils
@ -1088,8 +1088,8 @@ install_binutils()
# Remove Windows/Novell only man pages # Remove Windows/Novell only man pages
rm -f $local_mandir/{dlltool,nlmconv,windres,windmc}* rm -f $local_mandir/{dlltool,nlmconv,windres,windmc}*
%if %{without docs} %if %{without docs}
rm -f $local_mandir/{addr2line,ar,as,c++filt,elfedit,gprof,ld,nm,objcopy,objdump,ranlib,readelf,size,strings,strip}* rm -f $local_mandir/{addr2line,ar,as,c++filt,elfedit,gp,ld,nm,objcopy,objdump,ranlib,readelf,size,strings,strip}*
rm -f $local_infodir/{as,bfd,binutils,gprof,ld}* rm -f $local_infodir/{as,bfd,binutils,ctf,gprof,ld,sframe}*
%endif %endif
%if %{enable_shared} %if %{enable_shared}
@ -1299,11 +1299,6 @@ exit 0
%if %{with docs} %if %{with docs}
%{_mandir}/man1/ %{_mandir}/man1/
%if %{with gprofng}
%exclude %{_mandir}/man1/gp-*
%exclude %{_mandir}/man1/gprofng*
%exclude %{_infodir}/gprofng*
%endif
%{_infodir}/as.info.* %{_infodir}/as.info.*
%{_infodir}/binutils.info.* %{_infodir}/binutils.info.*
%{_infodir}/ld.info.* %{_infodir}/ld.info.*
@ -1312,6 +1307,11 @@ exit 0
%{_infodir}/ctf-spec.info.* %{_infodir}/ctf-spec.info.*
%{_infodir}/gprof.info.* %{_infodir}/gprof.info.*
%{_infodir}/sframe-spec.info.* %{_infodir}/sframe-spec.info.*
%if %{with gprofng}
%{_mandir}/man1/gp-*
%{_mandir}/man1/gprofng*
%{_infodir}/gprofng*
%endif
%endif %endif
%if %{enable_shared} %if %{enable_shared}
@ -1345,9 +1345,6 @@ exit 0
%files gprofng %files gprofng
%{_bindir}/gp-* %{_bindir}/gp-*
%{_bindir}/gprofng %{_bindir}/gprofng
%{_mandir}/man1/gp-*
%{_mandir}/man1/gprofng*
%{_infodir}/gprofng.info.*
%dir %{_libdir}/gprofng %dir %{_libdir}/gprofng
%{_libdir}/gprofng/* %{_libdir}/gprofng/*
%{_sysconfdir}/gprofng.rc %{_sysconfdir}/gprofng.rc
@ -1383,6 +1380,9 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Mon Jun 24 2024 Nick Clifton <nickc@redhat.com> - 2.41-44
- Fix building with documentation disabled. (RHEL-44615)
* Mon Jun 17 2024 Nick Clifton <nickc@redhat.com> - 2.41-43 * Mon Jun 17 2024 Nick Clifton <nickc@redhat.com> - 2.41-43
- Do not enable '-z separate code' by default - allow packages to choose to do it. - Do not enable '-z separate code' by default - allow packages to choose to do it.
- Add fix for discarded section counting for AArcch64 DT_RELR relocs. (RHEL-42765) - Add fix for discarded section counting for AArcch64 DT_RELR relocs. (RHEL-42765)