[1/2] strace: remove obsolete musl-on-MIPS patch

Message ID 20220131174013.817060-1-ross.burton@arm.com
State Accepted, archived
Commit 3ce2fd9f3002178ba2425c7912bf8b83a4150c9a
Headers show
Series [1/2] strace: remove obsolete musl-on-MIPS patch | expand

Commit Message

Ross Burton Jan. 31, 2022, 5:40 p.m. UTC
This patch was added as musl doesn't define SIGEMT on MIPS, but this was
a mistake in musl and has been  fixed in cabc369, available in musl
1.2.1 onwards (August 2020).

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../strace/strace/mips-SIGEMT.patch           | 33 -------------------
 meta/recipes-devtools/strace/strace_5.16.bb   |  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 meta/recipes-devtools/strace/strace/mips-SIGEMT.patch

Patch

diff --git a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch b/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
deleted file mode 100644
index e86da9707c9..00000000000
--- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 7 Aug 2016 23:47:57 -0700
-Subject: [PATCH] strace: Fix build with mips/mips64 on musl
-
-SIGEMT is not defined everywhere e.g musl does
-not define it. Therefore check it being defined
-before using it.
-
-Fixes errors e.g.
-../../strace-4.13/tests/signal2name.c:45:7: error: 'SIGEMT' undeclared (first use in this function)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
----
- tests/signal2name.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/signal2name.c b/tests/signal2name.c
-index 1d8e7c5..6722aa1 100644
---- a/tests/signal2name.c
-+++ b/tests/signal2name.c
-@@ -49,7 +49,9 @@ signal2name(int sig)
- 	CASE(SIGEMT);
- 	CASE(SIGLOST);
- #elif defined MIPS
-+#ifdef SIGEMT
- 	CASE(SIGEMT);
-+#endif
- 	CASE(SIGIOT);
- 	CASE(SIGPWR);
- #else
diff --git a/meta/recipes-devtools/strace/strace_5.16.bb b/meta/recipes-devtools/strace/strace_5.16.bb
index 1874ef1017c..1574b8e7773 100644
--- a/meta/recipes-devtools/strace/strace_5.16.bb
+++ b/meta/recipes-devtools/strace/strace_5.16.bb
@@ -9,7 +9,6 @@  SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://update-gawk-paths.patch \
            file://Makefile-ptest.patch \
            file://run-ptest \
-           file://mips-SIGEMT.patch \
            file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
            file://ptest-spacesave.patch \
            file://0001-strace-fix-reproducibilty-issues.patch \