diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-22 12:52:17 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-22 12:52:17 +0100 |
| commit | 3fa00c8a16cdbd8bed631606844e8f881ceec399 (patch) | |
| tree | e8fc6c09027c12149a7093fc83e0bac41eda9f87 /package/strace | |
| parent | c847620da9e572763586651df9c3543492fa4498 (diff) | |
some try to fix
Diffstat (limited to 'package/strace')
| -rw-r--r-- | package/strace/Makefile | 2 | ||||
| -rw-r--r-- | package/strace/patches/patch-syscall_c | 17 | ||||
| -rw-r--r-- | package/strace/patches/patch-util_c | 20 |
3 files changed, 17 insertions, 22 deletions
diff --git a/package/strace/Makefile b/package/strace/Makefile index 1908419af..20e92ad1c 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= strace PKG_VERSION:= 4.8 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575 PKG_DESCR:= System call trace program PKG_SECTION:= debug diff --git a/package/strace/patches/patch-syscall_c b/package/strace/patches/patch-syscall_c index 3f15e9297..ec944e5b0 100644 --- a/package/strace/patches/patch-syscall_c +++ b/package/strace/patches/patch-syscall_c @@ -1,5 +1,5 @@ --- strace-4.8.orig/syscall.c 2013-05-14 16:10:42.000000000 +0200 -+++ strace-4.8/syscall.c 2013-10-25 14:52:35.000000000 +0200 ++++ strace-4.8/syscall.c 2014-01-23 19:57:19.000000000 +0100 @@ -40,17 +40,6 @@ # ifndef PTRACE_PEEKUSR # define PTRACE_PEEKUSR PTRACE_PEEKUSER @@ -18,3 +18,18 @@ #endif #if defined(SPARC64) +@@ -72,13 +61,7 @@ + # include <elf.h> + #endif + +-#if defined(AARCH64) +-# include <asm/ptrace.h> +-#endif +- +-#if defined(XTENSA) +-# include <asm/ptrace.h> +-#endif ++#include <asm/ptrace.h> + + #ifndef ERESTARTSYS + # define ERESTARTSYS 512 diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c deleted file mode 100644 index e5bf2cfc9..000000000 --- a/package/strace/patches/patch-util_c +++ /dev/null @@ -1,20 +0,0 @@ ---- strace-4.8.orig/util.c 2013-05-06 20:23:01.000000000 +0200 -+++ strace-4.8/util.c 2013-10-25 14:54:06.000000000 +0200 -@@ -47,17 +47,6 @@ - #ifdef HAVE_SYS_REG_H - # include <sys/reg.h> - # define PTRACE_PEEKUSR PTRACE_PEEKUSER --#elif defined(HAVE_LINUX_PTRACE_H) --# undef PTRACE_SYSCALL --# ifdef HAVE_STRUCT_IA64_FPREG --# define ia64_fpreg XXX_ia64_fpreg --# endif --# ifdef HAVE_STRUCT_PT_ALL_USER_REGS --# define pt_all_user_regs XXX_pt_all_user_regs --# endif --# include <linux/ptrace.h> --# undef ia64_fpreg --# undef pt_all_user_regs - #endif - - int |