config/companion_libs/libelf.in
author Daniel Zimmermann <netzimme@gmail.com>
Mon Nov 25 08:56:55 2013 +0100 (2013-11-25)
changeset 3255 4f3536b12be5
parent 1873 4477403726db
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@245
     1
# libelf config file
yann@245
     2
yann@245
     3
choice
yann@245
     4
    bool
yann@245
     5
    prompt "libelf version"
yann@1535
     6
# Don't remove next line
yann@1535
     7
# CT_INSERT_VERSION_BELOW
yann@245
     8
yann@1873
     9
config LIBELF_V_0_8_13
yann@1873
    10
    bool
yann@1873
    11
    prompt "0.8.13"
yann@1873
    12
yann@1562
    13
config LIBELF_V_0_8_12
yann@1562
    14
    bool
yann@1562
    15
    prompt "0.8.12"
yann@1562
    16
yann@245
    17
endchoice
yann@245
    18
yann@245
    19
config LIBELF_VERSION
yann@245
    20
    string
yann@1535
    21
# Don't remove next line
yann@1535
    22
# CT_INSERT_VERSION_STRING_BELOW
yann@1873
    23
    default "0.8.13" if LIBELF_V_0_8_13
yann@1562
    24
    default "0.8.12" if LIBELF_V_0_8_12