summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYasir-Khan <yasir_khan@mentor.com>2014-08-12 17:40:58 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:51 +0100
commitf21f385228e6d09553ae3c438f2c6f9f868d0b58 (patch)
tree50538427defa0d0a4bddd1dfe589190e64da9bc6 /meta
parent295ce4ac8deb37b54f6cb2ddcf2ce67a0d7cda62 (diff)
downloadpoky-f21f385228e6d09553ae3c438f2c6f9f868d0b58.tar.gz
strace: apply ptrace.h conflict workaround
Apply patch from strace upstream to workaround ptrace.h header file conflict. This patch is not available in strace-4.8 tarball pulled in by recipe. * patch from strace upstream - Work around conflict between <sys/ptrace.h> and <linux/ptrace.h> (From OE-Core rev: 3c7301adce142bab64d49b5be7c39d8b223591f5) Signed-off-by: Yasir-Khan <yasir_khan@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch108
-rw-r--r--meta/recipes-devtools/strace/strace_4.8.bb1
2 files changed, 109 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch b/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
new file mode 100644
index 0000000000..5a0090eb6d
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace-4.8/0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
@@ -0,0 +1,108 @@
1Upstream-Status: Backport
2
3From 0b4060f61f1bb101b5d8d084714b7d2feacdb199 Mon Sep 17 00:00:00 2001
4From: Ali Polatel <alip@exherbo.org>
5Date: Tue, 24 Sep 2013 20:04:32 +0300
6Subject: [PATCH] Work around conflict between <sys/ptrace.h> and
7 <linux/ptrace.h>
8
9Since glibc-2.18~39 <sys/ptrace.h> defines ptrace_peeksiginfo_args
10which collides with <linux/ptrace.h>.
11
12* configure.ac: Check for `struct ptrace_peeksiginfo_args' in
13<sys/ptrace.h>.
14* process.c: Work around potential conflict between <sys/ptrace.h>
15and <linux/ptrace.h> by redefining ptrace_peeksiginfo_args.
16* signal.c: Likewise.
17* syscall.c: Likewise.
18* util.c: Likewise.
19
20Signed-off-by: Ali Polatel <alip@exherbo.org>
21---
22 configure.ac | 2 +-
23 process.c | 4 ++++
24 signal.c | 4 ++++
25 syscall.c | 4 ++++
26 util.c | 4 ++++
27 5 files changed, 17 insertions(+), 1 deletion(-)
28
29diff --git a/configure.ac b/configure.ac
30index f19e4f2..aa4923a 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -257,7 +257,7 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
34
35 AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
36
37-AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
38+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,,
39 [#include <sys/ptrace.h>])
40
41 AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>])
42diff --git a/process.c b/process.c
43index 1a2181b..59428a4 100644
44--- a/process.c
45+++ b/process.c
46@@ -63,7 +63,11 @@
47 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
48 # define pt_all_user_regs XXX_pt_all_user_regs
49 # endif
50+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
51+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
52+# endif
53 # include <linux/ptrace.h>
54+# undef ptrace_peeksiginfo_args
55 # undef ia64_fpreg
56 # undef pt_all_user_regs
57 #endif
58diff --git a/signal.c b/signal.c
59index 7fb9abf..3411ddd 100644
60--- a/signal.c
61+++ b/signal.c
62@@ -51,7 +51,11 @@
63 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
64 # define pt_all_user_regs XXX_pt_all_user_regs
65 # endif
66+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
67+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
68+# endif
69 # include <linux/ptrace.h>
70+# undef ptrace_peeksiginfo_args
71 # undef ia64_fpreg
72 # undef pt_all_user_regs
73 #endif
74diff --git a/syscall.c b/syscall.c
75index 83a95bd..3477dcd 100644
76--- a/syscall.c
77+++ b/syscall.c
78@@ -48,7 +48,11 @@
79 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
80 # define pt_all_user_regs XXX_pt_all_user_regs
81 # endif
82+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
83+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
84+# endif
85 # include <linux/ptrace.h>
86+# undef ptrace_peeksiginfo_args
87 # undef ia64_fpreg
88 # undef pt_all_user_regs
89 #endif
90diff --git a/util.c b/util.c
91index 0dab902..30a7f19 100644
92--- a/util.c
93+++ b/util.c
94@@ -55,7 +55,11 @@
95 # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
96 # define pt_all_user_regs XXX_pt_all_user_regs
97 # endif
98+# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
99+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
100+# endif
101 # include <linux/ptrace.h>
102+# undef ptrace_peeksiginfo_args
103 # undef ia64_fpreg
104 # undef pt_all_user_regs
105 #endif
106--
1071.8.2.1
108
diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb
index d954c37004..ed738eaad7 100644
--- a/meta/recipes-devtools/strace/strace_4.8.bb
+++ b/meta/recipes-devtools/strace/strace_4.8.bb
@@ -10,6 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
10 file://Makefile-ptest.patch \ 10 file://Makefile-ptest.patch \
11 file://strace-fix-64-bit-process-detection.patch \ 11 file://strace-fix-64-bit-process-detection.patch \
12 file://run-ptest \ 12 file://run-ptest \
13 file://0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch \
13 " 14 "
14 15
15SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" 16SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575"