summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-09-08 19:33:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 23:02:43 +0100
commit114f2cb80d6b18749bd05ceb203998ed6edcb61e (patch)
tree44e9595b223cb53380bb4aa6ccea06ff2f99b541
parentcc5d6ca85a40199a077403a0d0af0bd22eeefa06 (diff)
downloadpoky-114f2cb80d6b18749bd05ceb203998ed6edcb61e.tar.gz
ptrace: Drop ptrace aid for musl/ppc
This has been fixed and is no longer needed (From OE-Core rev: 74ea0264cc5ba27dd37053f79301d18c8f1b6e7d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch31
-rw-r--r--meta/recipes-devtools/strace/strace_5.2.bb1
2 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch b/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
deleted file mode 100644
index fb5f72529f..0000000000
--- a/meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Apr 2016 16:23:56 +0000
4Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc
5
6glibc includes the kernel header into its own header for macros
7musl does not
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12---
13 ptrace.h | 8 +++++++-
14 1 file changed, 7 insertions(+), 1 deletion(-)
15
16--- a/ptrace.h
17+++ b/ptrace.h
18@@ -30,7 +30,13 @@
19 # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
20 # endif
21
22+#if defined(POWERPC) && !defined(__GLIBC__)
23+#define pt_regs uapi_pt_regs
24+#endif
25 # include <linux/ptrace.h>
26+#if defined(POWERPC) && !defined(__GLIBC__)
27+# undef pt_regs
28+#endif
29
30 # ifdef HAVE_STRUCT_IA64_FPREG
31 # undef ia64_fpreg
diff --git a/meta/recipes-devtools/strace/strace_5.2.bb b/meta/recipes-devtools/strace/strace_5.2.bb
index 8367bf1a4f..a16c3b8598 100644
--- a/meta/recipes-devtools/strace/strace_5.2.bb
+++ b/meta/recipes-devtools/strace/strace_5.2.bb
@@ -10,7 +10,6 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
10 file://update-gawk-paths.patch \ 10 file://update-gawk-paths.patch \
11 file://Makefile-ptest.patch \ 11 file://Makefile-ptest.patch \
12 file://run-ptest \ 12 file://run-ptest \
13 file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \
14 file://mips-SIGEMT.patch \ 13 file://mips-SIGEMT.patch \
15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 14 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
16 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ 15 file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \