config/debug/strace.in
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 3149 e1611da4bb05
permissions -rw-r--r--
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
     1 # strace
     2 
     3 ## depends on ! BACKEND
     4 
     5 choice
     6     bool
     7     prompt "strace version"
     8 # Don't remove next line
     9 # CT_INSERT_VERSION_BELOW
    10 
    11 config STRACE_V_4_8
    12     bool
    13     prompt "4.8"
    14     depends on CONFIGURE_has_xz
    15 
    16 config STRACE_V_4_7
    17     bool
    18     prompt "4.7"
    19     depends on CONFIGURE_has_xz
    20 
    21 config STRACE_V_4_6
    22     bool
    23     prompt "4.6"
    24     depends on CONFIGURE_has_xz
    25 
    26 config STRACE_V_4_5_20
    27     bool
    28     prompt "4.5.20"
    29 
    30 config STRACE_V_4_5_19
    31     bool
    32     prompt "4.5.19"
    33 
    34 config STRACE_V_4_5_18
    35     bool
    36     prompt "4.5.18"
    37 
    38 endchoice
    39 
    40 config STRACE_VERSION
    41     string
    42 # Don't remove next line
    43 # CT_INSERT_VERSION_STRING_BELOW
    44     default "4.8" if STRACE_V_4_8
    45     default "4.7" if STRACE_V_4_7
    46     default "4.6" if STRACE_V_4_6
    47     default "4.5.20" if STRACE_V_4_5_20
    48     default "4.5.19" if STRACE_V_4_5_19
    49     default "4.5.18" if STRACE_V_4_5_18