summaryrefslogtreecommitdiff
path: root/config/debug
diff options
context:
space:
mode:
authorDaniel Zimmermann <netzimme@gmail.com>2013-11-25 07:56:55 (GMT)
committerDaniel Zimmermann <netzimme@gmail.com>2013-11-25 07:56:55 (GMT)
commita128e6fb54d8bb1329532999223829ebe474a31b (patch)
tree8100d3dea49c6d6a5b5e563bdc343df7cbc28dd6 /config/debug
parent2f94f99dd875ea38982376254f59bc51f3754982 (diff)
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> Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox> Patchwork-Id: 293842
Diffstat (limited to 'config/debug')
-rw-r--r--config/debug/strace.in12
1 files changed, 12 insertions, 0 deletions
diff --git a/config/debug/strace.in b/config/debug/strace.in
index 5cdef7e..19563a9 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -8,6 +8,16 @@ choice
# 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 @@ config STRACE_VERSION
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