summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-04-27 08:03:08 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2016-04-27 08:03:38 +0200
commitdffe927fb9efe074ba27025f6dee78fed419c5e3 (patch)
treeb6750f3a4692956bbd390929f829876cfebe88a6
parent728410b334733b9c9803f238e0a696d37593a354 (diff)
strace: fix musl ppc compile
-rw-r--r--package/strace/Makefile5
-rw-r--r--package/strace/patches/patch-ptrace_h12
2 files changed, 13 insertions, 4 deletions
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 707ccb674..f34debdb2 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= strace
PKG_VERSION:= 4.11
-PKG_RELEASE:= 5
+PKG_RELEASE:= 6
PKG_HASH:= e86a5f6cd8f941f67f3e4b28f4e60f3d9185c951cf266404533210a2e5cd8152
PKG_DESCR:= system call trace program
PKG_SECTION:= app/debug
@@ -20,9 +20,6 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS=s \
ifeq ($(ADK_TARGET_LIB_MUSL),y)
TARGET_CPPFLAGS+= -DMSG_EXCEPT=020000 -D_LARGEFILE64_SOURCE=1
-ifeq ($(ADK_TARGET_ARCH_PPC),y)
-TARGET_CPPFLAGS+= -Dsigcontext_struct=sigcontext -include ppc-regs.h
-endif
endif
INSTALL_STYLE:= manual
diff --git a/package/strace/patches/patch-ptrace_h b/package/strace/patches/patch-ptrace_h
new file mode 100644
index 000000000..c46bb7d7a
--- /dev/null
+++ b/package/strace/patches/patch-ptrace_h
@@ -0,0 +1,12 @@
+--- strace-4.11.orig/ptrace.h 2015-12-17 18:56:48.000000000 +0100
++++ strace-4.11/ptrace.h 2016-04-24 21:28:59.689052020 +0200
+@@ -52,7 +52,9 @@ extern long ptrace(int, int, char *, lon
+ # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ #endif
+
++#define pt_regs uapi_pt_regs
+ #include <linux/ptrace.h>
++#undef pt_regs
+
+ #ifdef HAVE_STRUCT_IA64_FPREG
+ # undef ia64_fpreg