diff options
| -rw-r--r-- | meta/recipes-devtools/strace/strace/0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace_5.2.bb | 1 |
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 @@ | |||
| 1 | From af1fdce78bff4343f3c84ea118abdc3c739fc646 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 30 Apr 2016 16:23:56 +0000 | ||
| 4 | Subject: [PATCH] Fix build when using non-glibc libc implementation on ppc | ||
| 5 | |||
| 6 | glibc includes the kernel header into its own header for macros | ||
| 7 | musl does not | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | Signed-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 \ |
