From: Alexandru Ardelean <ardeleanalex@gmail.com>
Date: Fri, 4 Nov 2016 15:59:08 +0000 (+0200)
Subject: devel/strace: fix build on mpc85xx target
X-Git-Tag: v17.01.0-rc1~925
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=519a199cbcc0930e229ddd7087309326a846bdce;p=oweals%2Fopenwrt.git

devel/strace: fix build on mpc85xx target

builbot faillog:
https://downloads.lede-project.org/snapshots/faillogs/powerpc_8540/base/strace/compile.txt

Seems that for PPC, the <linux/ptrace.h> header [from uapi] collides
with musl's <sys/user.h>, for the pt_regs struct.

Seems I tried to upstream this patch a while back:
https://lists.openwrt.org/pipermail/openwrt-devel/2016-April/041093.html

It seems to work on current LEDE trunk too.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
---

diff --git a/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch b/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
new file mode 100644
index 0000000000..9b9d12a286
--- /dev/null
+++ b/package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch
@@ -0,0 +1,14 @@
+--- a/ptrace.h
++++ b/ptrace.h
+@@ -52,7 +52,10 @@ extern long ptrace(int, int, char *, long);
+ # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ #endif
+ 
++#include <linux/types.h>
++#define __ASSEMBLY__
+ #include <linux/ptrace.h>
++#undef __ASSEMBLY__
+ 
+ #ifdef HAVE_STRUCT_IA64_FPREG
+ # undef ia64_fpreg
+--