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
yann@239
     1
# strace
yann@239
     2
yann@2444
     3
## depends on ! BACKEND
yann@239
     4
yann@239
     5
choice
yann@239
     6
    bool
yann@239
     7
    prompt "strace version"
yann@1535
     8
# Don't remove next line
yann@1535
     9
# CT_INSERT_VERSION_BELOW
yann@239
    10
netzimme@3255
    11
config STRACE_V_4_8
netzimme@3255
    12
    bool
netzimme@3255
    13
    prompt "4.8"
netzimme@3255
    14
    depends on CONFIGURE_has_xz
netzimme@3255
    15
netzimme@3255
    16
config STRACE_V_4_7
netzimme@3255
    17
    bool
netzimme@3255
    18
    prompt "4.7"
netzimme@3255
    19
    depends on CONFIGURE_has_xz
netzimme@3255
    20
bryanhundven@2733
    21
config STRACE_V_4_6
bryanhundven@2733
    22
    bool
yann@3149
    23
    prompt "4.6"
yann@2868
    24
    depends on CONFIGURE_has_xz
bryanhundven@2733
    25
yann@2006
    26
config STRACE_V_4_5_20
yann@2006
    27
    bool
yann@3149
    28
    prompt "4.5.20"
yann@2006
    29
yann@1613
    30
config STRACE_V_4_5_19
yann@1613
    31
    bool
yann@1785
    32
    prompt "4.5.19"
yann@1613
    33
yann@1534
    34
config STRACE_V_4_5_18
yann@239
    35
    bool
yann@1613
    36
    prompt "4.5.18"
yann@1534
    37
yann@239
    38
endchoice
yann@239
    39
yann@239
    40
config STRACE_VERSION
yann@239
    41
    string
yann@1535
    42
# Don't remove next line
yann@1535
    43
# CT_INSERT_VERSION_STRING_BELOW
netzimme@3255
    44
    default "4.8" if STRACE_V_4_8
netzimme@3255
    45
    default "4.7" if STRACE_V_4_7
bryanhundven@2733
    46
    default "4.6" if STRACE_V_4_6
yann@2006
    47
    default "4.5.20" if STRACE_V_4_5_20
yann@1613
    48
    default "4.5.19" if STRACE_V_4_5_19
yann@1534
    49
    default "4.5.18" if STRACE_V_4_5_18