* [PATCH] debug/strace: pump version to 4.7 and 4.8
@ 2013-11-25 7:58 Daniel Zimmermann
2013-12-12 22:35 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Zimmermann @ 2013-11-25 7:58 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: crossgcc
# HG changeset patch
# User Daniel Zimmermann <netzimme@gmail.com>
# Date 1385366215 -3600
# Mon Nov 25 08:56:55 2013 +0100
# Node ID 67b082cf1cdc8276eb4a709e8098f0f45e1e63e2
# Parent 7e569a9cb5fd3ab591bb307328b947a5b7312cba
debug/strace: pump version to 4.7 and 4.8
Pump version for strace to 4.7 and 4.8.
Add patch from strace mainline.
Work around conflict between <sys/ptrace.h> and <linux/ptrace.h>
Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
which collides with <linux/ptrace.h>.
* configure.ac: Check for `struct ptrace_peeksiginfo_args' in
<sys/ptrace.h>.
* process.c: Work around potential conflict between <sys/ptrace.h>
and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
* signal.c: Likewise.
* syscall.c: Likewise.
* util.c: Likewise.
http://sourceforge.net/p/strace/code/ci/0b4060f61f1bb101b5d8d084714b7d2feacdb199/
Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
diff -r 7e569a9cb5fd -r 67b082cf1cdc config/debug/strace.in
--- a/config/debug/strace.in Sat Nov 16 18:14:45 2013 +0100
+++ b/config/debug/strace.in Mon Nov 25 08:56:55 2013 +0100
@@ -8,6 +8,16 @@
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config STRACE_V_4_8
+ bool
+ prompt "4.8"
+ depends on CONFIGURE_has_xz
+
+config STRACE_V_4_7
+ bool
+ prompt "4.7"
+ depends on CONFIGURE_has_xz
+
config STRACE_V_4_6
bool
prompt "4.6"
@@ -31,6 +41,8 @@
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "4.8" if STRACE_V_4_8
+ default "4.7" if STRACE_V_4_7
default "4.6" if STRACE_V_4_6
default "4.5.20" if STRACE_V_4_5_20
default "4.5.19" if STRACE_V_4_5_19
diff -r 7e569a9cb5fd -r 67b082cf1cdc patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/strace/4.8/001-strace-4.8-glibc_2.18_build_fix-1.patch Mon Nov 25 08:56:55 2013 +0100
@@ -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
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 2+ messages in thread
* debug/strace: pump version to 4.7 and 4.8
2013-11-25 7:58 [PATCH] debug/strace: pump version to 4.7 and 4.8 Daniel Zimmermann
@ 2013-12-12 22:35 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2013-12-12 22:35 UTC (permalink / raw)
To: Daniel Zimmermann; +Cc: crossgcc
Daniel, All,
Your patch:
debug/strace: pump version to 4.7 and 4.8
has been applied as: #4f3536b12be5
http://crosstool-ng.org/hg/crosstool-ng/rev/4f3536b12be5
Thank you!
Regards,
Yann E. MORIN.
--
For unsubscribe information see http://sourceware.org/lists.html#faq
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-12 22:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-25 7:58 [PATCH] debug/strace: pump version to 4.7 and 4.8 Daniel Zimmermann
2013-12-12 22:35 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).