diff options
author | 2017-12-02 23:30:38 (GMT) | |
---|---|---|
committer | 2017-12-02 23:30:38 (GMT) | |
commit | d917a29865876b913fe2939ee2a0728145e8543a (patch) | |
tree | 4e048ed57988306696efa3c5b81a80d48030e913 /packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch | |
parent | e832b9b220f90b11b893e2815ceb37ec2b708683 (diff) | |
parent | 98bc4decdeab1361bdc585c86591718fb08c8ffb (diff) |
Merge pull request #874 from stilor/renumber-update-patches
Renumber & update patches
Diffstat (limited to 'packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch')
-rw-r--r-- | packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch b/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch deleted file mode 100644 index 49a71e1..0000000 --- a/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch +++ /dev/null @@ -1,78 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2013-08-26 -Initial Package Version: 4.8 -Upstream Status: Unknown -Origin: Unknown -Description: Fixes compilation with glibc-2.18. -From OpenSuse factory, found in strace-4.8-2.1.src.rpm by rpmfind.net. -http://download.opensuse.org/factory/repo/src-oss/suse/strace-4.8-2.1.src.rpm -Their changelog reports: - * Wed Aug 14 2013 schwab@suse.de - - strace-linux-ptrace-h.patch: handle conflict with struct - ptrace_peeksiginfo_args between <sys/ptrace.h> and <linux/ptrace.h> - - -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 |