diff options
| author | Ross Burton <ross@burtonini.com> | 2022-01-31 17:40:12 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-03 09:05:14 +0000 |
| commit | 2d4589316c34d9a64e1885c51e90e621ad895611 (patch) | |
| tree | 63a98cfc40d5d77cbb9e035fe90c11639397a4d9 /meta | |
| parent | 9e54790c6e3a1e6239700031e8d7d7e1d0c6407e (diff) | |
| download | poky-2d4589316c34d9a64e1885c51e90e621ad895611.tar.gz | |
strace: remove obsolete musl-on-MIPS patch
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).
(From OE-Core rev: 3ce2fd9f3002178ba2425c7912bf8b83a4150c9a)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/strace/strace/mips-SIGEMT.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace_5.16.bb | 1 |
2 files changed, 0 insertions, 34 deletions
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 e86da9707c..0000000000 --- a/meta/recipes-devtools/strace/strace/mips-SIGEMT.patch +++ /dev/null | |||
| @@ -1,33 +0,0 @@ | |||
| 1 | From 794648d84672bbda30a920a05540b56cd155ed9d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sun, 7 Aug 2016 23:47:57 -0700 | ||
| 4 | Subject: [PATCH] strace: Fix build with mips/mips64 on musl | ||
| 5 | |||
| 6 | SIGEMT is not defined everywhere e.g musl does | ||
| 7 | not define it. Therefore check it being defined | ||
| 8 | before using it. | ||
| 9 | |||
| 10 | Fixes errors e.g. | ||
| 11 | ../../strace-4.13/tests/signal2name.c:45:7: error: 'SIGEMT' undeclared (first use in this function) | ||
| 12 | |||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | --- | ||
| 17 | tests/signal2name.c | 2 ++ | ||
| 18 | 1 file changed, 2 insertions(+) | ||
| 19 | |||
| 20 | diff --git a/tests/signal2name.c b/tests/signal2name.c | ||
| 21 | index 1d8e7c5..6722aa1 100644 | ||
| 22 | --- a/tests/signal2name.c | ||
| 23 | +++ b/tests/signal2name.c | ||
| 24 | @@ -49,7 +49,9 @@ signal2name(int sig) | ||
| 25 | CASE(SIGEMT); | ||
| 26 | CASE(SIGLOST); | ||
| 27 | #elif defined MIPS | ||
| 28 | +#ifdef SIGEMT | ||
| 29 | CASE(SIGEMT); | ||
| 30 | +#endif | ||
| 31 | CASE(SIGIOT); | ||
| 32 | CASE(SIGPWR); | ||
| 33 | #else | ||
diff --git a/meta/recipes-devtools/strace/strace_5.16.bb b/meta/recipes-devtools/strace/strace_5.16.bb index 1874ef1017..1574b8e777 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 \ | |||
| 9 | file://update-gawk-paths.patch \ | 9 | file://update-gawk-paths.patch \ |
| 10 | file://Makefile-ptest.patch \ | 10 | file://Makefile-ptest.patch \ |
| 11 | file://run-ptest \ | 11 | file://run-ptest \ |
| 12 | file://mips-SIGEMT.patch \ | ||
| 13 | file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ | 12 | file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ |
| 14 | file://ptest-spacesave.patch \ | 13 | file://ptest-spacesave.patch \ |
| 15 | file://0001-strace-fix-reproducibilty-issues.patch \ | 14 | file://0001-strace-fix-reproducibilty-issues.patch \ |
