Author: ken Date: Mon Aug 26 08:13:38 2013 New Revision: 2720 Log: Patch to allow strace to build again.
Added: trunk/strace/strace-4.8-glibc_2.18_build_fix-1.patch Added: trunk/strace/strace-4.8-glibc_2.18_build_fix-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/strace/strace-4.8-glibc_2.18_build_fix-1.patch Mon Aug 26 08:13:38 2013 (r2720) @@ -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 [email protected] + - 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 -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
