From 6765a17f36ebd3493758f23d1170dbe01c86f406 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 25 Oct 2013 13:01:35 +0200 Subject: fix strace compile --- package/strace/Makefile | 2 +- package/strace/patches/patch-defs_h | 12 ++++++++++-- package/strace/patches/patch-defs_h.orig | 14 -------------- package/strace/patches/patch-process_c | 23 +++++++++++++++++++---- 4 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 package/strace/patches/patch-defs_h.orig (limited to 'package/strace') diff --git a/package/strace/Makefile b/package/strace/Makefile index a09877355..b2a8ab701 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:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575 PKG_DESCR:= System call trace program PKG_SECTION:= debug diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h index 50d061348..5f0cd1732 100644 --- a/package/strace/patches/patch-defs_h +++ b/package/strace/patches/patch-defs_h @@ -1,6 +1,14 @@ --- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200 -+++ strace-4.8/defs.h 2013-08-14 08:51:03.000000000 +0200 -@@ -162,7 +162,7 @@ extern char *stpcpy(char *dst, const cha ++++ strace-4.8/defs.h 2013-10-24 18:52:25.000000000 +0200 +@@ -155,14 +155,14 @@ extern char *stpcpy(char *dst, const cha + || defined(METAG) \ + || defined(TILE) \ + || defined(XTENSA) \ +- ) && defined(__GLIBC__) ++ ) && defined(__linux__) + # include + #else + /* Work around awkward prototype in ptrace.h. */ # define ptrace xptrace # include # undef ptrace diff --git a/package/strace/patches/patch-defs_h.orig b/package/strace/patches/patch-defs_h.orig deleted file mode 100644 index 60ca6e97a..000000000 --- a/package/strace/patches/patch-defs_h.orig +++ /dev/null @@ -1,14 +0,0 @@ ---- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200 -+++ strace-4.8/defs.h 2013-08-14 08:01:46.000000000 +0200 -@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon - # define PTRACE_EVENT_EXIT 6 - #endif - --#if !defined(__GLIBC__) --# define PTRACE_PEEKUSER PTRACE_PEEKUSR --# define PTRACE_POKEUSER PTRACE_POKEUSR --#endif -- - #if USE_SEIZE - # undef PTRACE_SEIZE - # define PTRACE_SEIZE 0x4206 diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c index 7fa9541f1..133b42525 100644 --- a/package/strace/patches/patch-process_c +++ b/package/strace/patches/patch-process_c @@ -1,6 +1,21 @@ --- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200 -+++ strace-4.8/process.c 2013-08-14 08:47:15.000000000 +0200 -@@ -2857,7 +2857,7 @@ sys_sched_setscheduler(struct tcb *tcp) ++++ strace-4.8/process.c 2013-10-24 18:57:55.000000000 +0200 +@@ -56,14 +56,12 @@ + #endif + + #ifdef 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 + # undef ia64_fpreg + # undef pt_all_user_regs + #endif +@@ -2857,7 +2855,7 @@ sys_sched_setscheduler(struct tcb *tcp) if (umove(tcp, tcp->u_arg[2], &p) < 0) tprintf(", %#lx", tcp->u_arg[2]); else @@ -9,7 +24,7 @@ } return 0; } -@@ -2872,7 +2872,7 @@ sys_sched_getparam(struct tcb *tcp) +@@ -2872,7 +2870,7 @@ sys_sched_getparam(struct tcb *tcp) if (umove(tcp, tcp->u_arg[1], &p) < 0) tprintf("%#lx", tcp->u_arg[1]); else @@ -18,7 +33,7 @@ } return 0; } -@@ -2885,7 +2885,7 @@ sys_sched_setparam(struct tcb *tcp) +@@ -2885,7 +2883,7 @@ sys_sched_setparam(struct tcb *tcp) if (umove(tcp, tcp->u_arg[1], &p) < 0) tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); else -- cgit v1.2.3