diff options
author | 2017-07-13 07:38:03 (GMT) | |
---|---|---|
committer | 2017-07-13 07:38:03 (GMT) | |
commit | 45c5bb0f484cba724be2c6105801dcce9a1a82d9 (patch) | |
tree | 8fd1c8eaa2ef203009d72b6ca6348611dcc5ee1c /packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch | |
parent | 8f8e131d566af1f577d8fb6e62e6f121b7955472 (diff) | |
parent | b32fcf7c1eea890a2bd3f88487f818ba241aabb1 (diff) |
Merge pull request #767 from stilor/packages
Packages
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, 78 insertions, 0 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 new file mode 100644 index 0000000..49a71e1 --- /dev/null +++ b/packages/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch @@ -0,0 +1,78 @@ +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 |