pool/strace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 187081 from devel:tools

Browse Source 
- strace-linux-ptrace-h.patch: handle conflict with struct
  ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h> (forwarded request 187005 from Andreas_Schwab)

OBS-URL: https://build.opensuse.org/request/show/187081
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/strace?expand=0&rev=39
This commit is contained in:
Tomáš Chvátal 2013-08-15 07:16:41 +00:00 committed by Git OBS Bridge
commit 16130f5bae
3 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
strace-linux-ptrace-h.patch Normal file
View File

@ -0,0 +1,64 @@
Index: strace-4.8/process.c
===================================================================
--- strace-4.8.orig/process.c
+++ strace-4.8/process.c
@@ -63,9 +63,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
# include <linux/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
+# undef ptrace_peeksiginfo_args
#endif
#if defined(SPARC64)
Index: strace-4.8/signal.c
===================================================================
--- strace-4.8.orig/signal.c
+++ strace-4.8/signal.c
@@ -51,9 +51,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
# include <linux/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
+# undef ptrace_peeksiginfo_args
#endif
#ifdef IA64
Index: strace-4.8/syscall.c
===================================================================
--- strace-4.8.orig/syscall.c
+++ strace-4.8/syscall.c
@@ -48,9 +48,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
# include <linux/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
+# undef ptrace_peeksiginfo_args
#endif
#if defined(SPARC64)
Index: strace-4.8/util.c
===================================================================
--- strace-4.8.orig/util.c
+++ strace-4.8/util.c
@@ -55,9 +55,11 @@
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
# include <linux/ptrace.h>
# undef ia64_fpreg
# undef pt_all_user_regs
+# undef ptrace_peeksiginfo_args
#endif
int

6
strace.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 14 09:11:17 UTC 2013 - schwab@suse.de
- strace-linux-ptrace-h.patch: handle conflict with struct
ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h>
-------------------------------------------------------------------
Thu Jun 13 15:49:29 UTC 2013 - jengelh@inai.de

2
strace.spec
View File

@ -31,6 +31,7 @@ Source2: http://downloads.sourceforge.net/strace/%name-%version.tar.xz.as
Source3: %name.keyring
Source4: baselibs.conf
Patch1: strace-4.7.diff
Patch2: strace-linux-ptrace-h.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libacl-devel
BuildRequires: libaio-devel
@ -61,6 +62,7 @@ Authors:
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q
%patch -P 1 -p1
%patch2 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"