diff --git a/binutils-egrep.patch b/binutils-egrep.patch new file mode 100644 index 0000000..429a084 --- /dev/null +++ b/binutils-egrep.patch @@ -0,0 +1,11 @@ +--- binutils-2.39/ld/testsuite/ld-elfvers/vers.exp 2023-10-30 13:08:25.863377518 +0000 ++++ binutils.orig/ld/testsuite/ld-elfvers/vers.exp 2023-10-30 13:05:18.094268608 +0000 +@@ -109,7 +109,7 @@ proc test_ar { test lib object expect } + return + } + +- set cmd "$nm --print-armap $tmpdir/$lib | grep \\\ in\\\ | egrep VERS\\\|bar\\\|foo | grep -v ^\\\\. | sort > $tmpdir/nm.out" ++ set cmd "$nm --print-armap $tmpdir/$lib | grep \\\ in\\\ | grep -E VERS\\\|bar\\\|foo | grep -v ^\\\\. | sort > $tmpdir/nm.out" + verbose -log $cmd + catch "exec $cmd" exec_output + if [string match "" $exec_output] then { diff --git a/binutils.spec b/binutils.spec index 1ca53f2..e07717b 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?_with_debug:-debug} Version: 2.39 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -296,6 +296,10 @@ Patch26: binutils-reloc-symtab.patch # Lifetime: Fixed in 2.41 (maybe) Patch27: binutils-gold-empty-dwp.patch +# Purpose: Replace "egrep" with "grep -E" in linker testsuite +# Lifetime: Fixed in 2.40 +Patch28: binutils-egrep.patch + #---------------------------------------------------------------------------- Provides: bundled(libiberty) @@ -1224,6 +1228,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Oct 30 2023 Adam Williamson - 2.39-16 +- Use "grep -e" instead of "egrep" in linker tests. (#2244632) + * Fri Aug 18 2023 Adam Williamson - 2.39-15 - Another CI fix