!30 [sync] PR-27: delete redundant patches

From: @openeuler-sync-bot 
Reviewed-by: @hubin95 
Signed-off-by: @hubin95

backport-Redirect-stder-in-gdb-add-index.sh-test.patch

@@ -1,31 +0,0 @@
-From d03a041790e1d0ecb900ec1de57580bca9519daa Mon Sep 17 00:00:00 2001
-From: Mark Wielaard <mark@klomp.org>
-Date: Sat, 2 Jul 2022 01:11:00 +0200
-Subject: [PATCH] Redirect stder in gdb-add-index.sh test
-
-gdb-add-index might produce an error message on stderr when trying to
-disable debuginfod support. Any message to stderr makes the testcase
-fail. This looks like a gdb bug:
-https://sourceware.org/bugzilla/show_bug.cgi?id=29316
-But it is easy to workaround by redirecting stderr to stdout.
----
- testsuite/dwz.tests/gdb-add-index.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/testsuite/dwz.tests/gdb-add-index.sh b/testsuite/dwz.tests/gdb-add-index.sh
-index 5a91b23..3095efb 100644
---- a/testsuite/dwz.tests/gdb-add-index.sh
-+++ b/testsuite/dwz.tests/gdb-add-index.sh
-@@ -1,6 +1,8 @@
- cp $execs/hello 1
- 
--gdb-add-index 1
-+# Redirect gdb-add-index stderr to stdout.
-+# https://sourceware.org/bugzilla/show_bug.cgi?id=29316
-+gdb-add-index 1 2>&1
- 
- readelf -S 1 | grep -q '\.gdb_index'
- 
--- 
-2.31.1
-

dwz.spec

@@ -1,6 +1,6 @@
 Name: dwz
 Version: 0.15
-Release: 1
+Release: 2
 Summary: A DWARF optimization and duplicate removal tool
 License: GPLv2+ and GPLv3+
 URL: https://sourceware.org/dwz/
@@ -52,6 +52,9 @@ make check
 %{_mandir}/man1/dwz*
 
 %changelog
+* Fri Jan 17 2025 hugel <gengqihu2@h-partners.com> - 0.15-2
+- delete redundant patches
+
 * Thu Jan 19 2023 renhongxun <renhongxun@h-partner.com> - 0.15-1
 - upgrade version to 0.15
 

testsuite-Handle-readelf-following-links-by-default.patch

@@ -1,58 +0,0 @@
-From b1f26dc76158e1f3364836d8b540b17a7a1ccb3d Mon Sep 17 00:00:00 2001
-From: Tom de Vries <tdevries@suse.de>
-Date: Sat, 20 Mar 2021 09:37:31 +0100
-Subject: [PATCH] [testsuite] Handle readelf following links by default
-
-Since binutils commit c46b706620e "Change the readelf and objdump programs so
-that they will automatically follow links to separate debug info files" there
-are a few FAILs in the dwz testsuite.
-
-This is just due to changing the default behaviour for readelf.
-
-Fix this by testing whether the new -Wn readelf flag is supported,
-and if so, adding it to the readelf call.
-
-2021-03-20  Tom de Vries  <tdevries@suse.de>
-
-	PR dwz/27592
-	* testsuite/dwz.tests/odr-struct-multifile.sh: Call readelf with -wN
-	if supported.
-	* testsuite/dwz.tests/cycle.sh: Same.
----
- testsuite/dwz.tests/odr-struct-multifile.sh | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh
-index cc462c9..20b682b 100644
---- a/testsuite/dwz.tests/odr-struct-multifile.sh
-+++ b/testsuite/dwz.tests/odr-struct-multifile.sh
-@@ -2,6 +2,11 @@ if ! $execs/dwz-for-test --odr -v 2>/dev/null; then
-     exit 77
- fi
- 
-+readelf_flags=""
-+if readelf -h 2>&1 | grep -q "\-wN"; then
-+    readelf_flags=-wN
-+fi
-+
- cp $execs/odr-struct 1
- cp 1 2
- 
-@@ -41,12 +46,12 @@ done
- 
- 
- for name in aaa bbb ccc; do
--    cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true)
-+    cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true)
-     [ $cnt -eq 0 ]
- done
- 
- for name in member_one member_two member_three member_four; do
--    cnt=$(readelf -wi 1 | grep -c "DW_AT_name.*:.*$name" || true)
-+    cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true)
-     [ $cnt -eq 0 ]
- done
- 
--- 
-1.8.3.1
-