From 114f2cb80d6b18749bd05ceb203998ed6edcb61e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 8 Sep 2019 19:33:26 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...hen-using-non-glibc-libc-implementation-o.patch | 31 ---------------------- meta/recipes-devtools/strace/strace_5.2.bb | 1 - 2 files changed, 32 deletions(-) delete mode 100644 meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch 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 @@ -From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Apr 2016 16:23:56 +0000 -Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc - -glibc includes the kernel header into its own header for macros -musl does not - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - ptrace.h | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/ptrace.h -+++ b/ptrace.h -@@ -30,7 +30,13 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - # endif - -+#if defined(POWERPC) && !defined(__GLIBC__) -+#define pt_regs uapi_pt_regs -+#endif - # include -+#if defined(POWERPC) && !defined(__GLIBC__) -+# undef pt_regs -+#endif - - # ifdef HAVE_STRUCT_IA64_FPREG - # 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 \ file://update-gawk-paths.patch \ file://Makefile-ptest.patch \ file://run-ptest \ - file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ -- cgit v1.2.3-54-g00ecf