diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-08-25 23:25:15 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:29:45 +0100 |
commit | 126227582a06fecb4971315be6aa72be07636ac4 (patch) | |
tree | ed533afdb31ac8ccc0426c6228cd9b0854c19ca0 /meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb | |
parent | 1f18e092298a3ef3f0c65da26b0f09043a6896fb (diff) | |
download | poky-126227582a06fecb4971315be6aa72be07636ac4.tar.gz |
linux-libc-headers: ptrace.h: remove ptrace_peeksiginfo_args
The addition of ptrace_peeksiginfo_args to the uapi in kernel commit
84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
means that existing applications using glibc versions that define ptrace_peeksiginfo_args
in sys/ptrace.h will get duplicate structure definitions like:
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
| struct ptrace_peeksiginfo_args {
| ^
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
| from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
| struct ptrace_peeksiginfo_args
| ^
| make[2]: *** [process.o] Error 1
Reverting to the previous status of not exporting this structure temporarily
fixes applications, until they can be adjusted to not mix sys/ptrace.h and
linux/ptrace.h includes.
(From OE-Core rev: 7c207e4c3c0e3b575c67a302b97b0dc700a8fc15)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb index eb04367ce5..b2e6f0f643 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require linux-libc-headers.inc | 1 | require linux-libc-headers.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch" |
4 | 4 | ||
5 | SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" | 5 | SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" |
6 | SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" | 6 | SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" |