Waldemar Brodkorb 8 лет назад
Родитель
Сommit
dffe927fb9
2 измененных файлов с 13 добавлено и 4 удалено
  1. 1 4
      package/strace/Makefile
  2. 12 0
      package/strace/patches/patch-ptrace_h

+ 1 - 4
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

+ 12 - 0
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