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.
0b4060f61f/
Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <67b082cf1cdc8276eb4a.1385366288@haus-VirtualBox>
Patchwork-Id: 293842
Here's a couple of patches to get strace 4.5.19 to configure and build
properly with the latest kernel headers. Not pretty, but hopefully
enough while we wait for 4.5.20 to be released.
With the current strace-4.5.19 patches I failed to get the configure
script running even on my host environment. Also, when cross building
the configure script needs to look for the proper system headers to be
able to properly set HAVE_LINUX_NETLINK_H. Otherwise you get:
[EXTRA] Building strace
[ERROR] /home/jocke/x-tools/targets/src/strace-4.5.19/net.c:976:
error: field 'nl' has incomplete type
[ERROR] make[2]: *** [net.o] Error 1
[ERROR] make[1]: *** [all] Error 2
The fix was simple, backport a change set from the git[1] tree and run
autoreconf to update the configure script.
[1] - http://strace.git.sourceforge.net/git/gitweb.cgi?p=strace/strace;a=commit;h=f0df31e71a58c6e79ba77c1a9d84b2f38d44bec7
[This] patch is a simple one for strace 4.5.17 .They altered the
exported kernel headers post 2.6.26 and removed a header. This patch
is a backport from the strace revision system. This allows strace to
be built with 2.6.27 and later kernel versions
/trunk/patches/strace/4.5.17/190-dirent-include.patch | 33 33 0 0 +++++++++++++++++++++++++
1 file changed, 33 insertions(+)
- propagated the 4.5.16 patch set
- EXPERIMENTAL, as it does not build on at least ARM
/trunk/patches/strace/4.5.18/160-undef-syscall.patch | 22 0 22 0 ----------------------
/trunk/config/debug/strace.in | 6 6 0 0 ++++++
2 files changed, 6 insertions(+), 22 deletions(-)
