From 03064399e6d7c35a7ebbba06ed570ebf65caaa4d Mon Sep 17 00:00:00 2001 From: Qiang Wei Date: Fri, 2 Sep 2022 18:06:43 +0800 Subject: [PATCH] Fix manpage empty issue. Signed-off-by: Qiang Wei (cherry picked from commit 24a323b807d87ca4831f0f1312fbabac20974367) --- ...no-op-no-split-option-support-PR2814.patch | 37 +++++++++++++++++++ binutils.spec | 8 +++- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch diff --git a/backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch b/backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch new file mode 100644 index 0000000..1504f39 --- /dev/null +++ b/backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch @@ -0,0 +1,37 @@ +From 96a7037cd8573cf065aa6b12baca68696f96d9ca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 26 Jul 2021 22:51:18 +0100 +Subject: [PATCH] texi2pod.pl: add no-op --no-split option support [PR28144] + +Change 2faf902da ("generate single html manual page by default") +added use of --no-split option to makeinfo. binutils reuses +makeinfo options for texi2pod.pl wrapper. Unsupported option +led to silent manpage truncation. + +The change adds no-op option support. + +etc/ + + * texi2pod.pl: Handle no-op --no-split option. + +Signed-off-by: Wei, Qiang +--- + etc/texi2pod.pl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/etc/texi2pod.pl b/etc/texi2pod.pl +index 11f70d156be..dcf2b437640 100644 +--- a/etc/texi2pod.pl ++++ b/etc/texi2pod.pl +@@ -59,6 +59,8 @@ while ($_ = shift) { + $flag = shift; + } + push (@ipath, $flag); ++ } elsif (/^--no-split$/) { ++ # ignore option for makeinfo compatibility + } elsif (/^-/) { + usage(); + } else { +-- +2.33.0 + diff --git a/binutils.spec b/binutils.spec index 4399f38..7214eba 100644 --- a/binutils.spec +++ b/binutils.spec @@ -1,7 +1,7 @@ Summary: Binary utilities Name: binutils Version: 2.37 -Release: 8 +Release: 9 License: GPLv3+ URL: https://sourceware.org/binutils @@ -32,7 +32,7 @@ Patch9: backport-0003-CVE-2021-42574.patch Patch10: bfd-Close-the-file-descriptor-if-there-is-no-archive.patch Patch11: binutils-AArch64-EFI.patch Patch12: backport-0001-PR28391-strip-objcopy-preserve-dates-.a-cannot-set-t.patch - +Patch13: backport-0001-texi2pod.pl-add-no-op-no-split-option-support-PR2814.patch Provides: bundled(libiberty) @@ -112,6 +112,7 @@ sed -i -e "s/^DEJATOOL = .*/DEJATOOL = binutils/" binutils/Makefile.in sed -i -e "s/^DEJATOOL = .*/DEJATOOL = gas/" gas/Makefile.in sed -i -e "s/^DEJATOOL = .*/DEJATOOL = ld/" ld/Makefile.in +touch gas/doc/as.texi touch */configure %build @@ -355,6 +356,9 @@ fi %{_infodir}/bfd*info* %changelog +* Fri Sep 02 2022 Wei, Qiang - 2.37-9 +- Fix man page empty issue + * Fri Aug 05 2022 maminjie - 2.37-8 - Fix preserve_dates: cannot set time -- Gitee