diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2016-11-04 17:59:08 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-11-08 05:49:58 +0100 |
| commit | 519a199cbcc0930e229ddd7087309326a846bdce (patch) | |
| tree | 1960b5134da566c8b7ea2192827e2482655649a7 /package/devel/strace | |
| parent | 862e7fb7b31fa0fffeeecd51dd852fce91db2b47 (diff) | |
| download | upstream-519a199cbcc0930e229ddd7087309326a846bdce.tar.gz upstream-519a199cbcc0930e229ddd7087309326a846bdce.tar.bz2 upstream-519a199cbcc0930e229ddd7087309326a846bdce.zip | |
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>
Diffstat (limited to 'package/devel/strace')
| -rw-r--r-- | package/devel/strace/patches/100-workaround--pt-reg-collisions-ppc.patch | 14 |
1 files changed, 14 insertions, 0 deletions
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 +-- |