diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-09-30 17:33:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-09 10:21:23 +0000 |
commit | 24ad27878c404493d01bc8cdffaad5634f854330 (patch) | |
tree | fb6954c734dc5d0884ce1165564cbb4a03fab32e /meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch | |
parent | bfe16dbb3c237992a4d5bfc0bbd249257c3b9aff (diff) | |
download | poky-24ad27878c404493d01bc8cdffaad5634f854330.tar.gz |
strace: Upgrade to 4.9
Remove two backported patches:
0001-Work-around-conflict-between-sys-ptrace.h-and-linux-.patch
strace-fix-64-bit-process-detection.patch
Update two patches to fit new version:
Makefile-ptest.patch
strace-add-configure-options.patch
Add coreutils, grep and gawk to RDEPENDS_${PN}-ptest for making
ptest pass.
(From OE-Core rev: 826e36643a3fcb8b4ee4ed79612c63c3a9cc1536)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch')
-rw-r--r-- | meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch new file mode 100644 index 0000000000..15e37bce03 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.9/strace-add-configure-options.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | Add options "aio" and "acl" to enable/disable libaio and acl support. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
6 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
7 | --- | ||
8 | configure.ac | 27 ++++++++++++++++++++++++++- | ||
9 | 1 file changed, 26 insertions(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/configure.ac b/configure.ac | ||
12 | index 054f85b..8ed49f1 100644 | ||
13 | --- a/configure.ac | ||
14 | +++ b/configure.ac | ||
15 | @@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([ | ||
16 | poll.h | ||
17 | scsi/sg.h | ||
18 | stropts.h | ||
19 | - sys/acl.h | ||
20 | sys/asynch.h | ||
21 | sys/conf.h | ||
22 | sys/epoll.h | ||
23 | @@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([ | ||
24 | sys/uio.h | ||
25 | sys/vfs.h | ||
26 | ])) | ||
27 | + | ||
28 | +AC_ARG_ENABLE([acl], | ||
29 | + [AS_HELP_STRING([--enable-acl], [turn on acl support])], | ||
30 | + [case $enableval in | ||
31 | + yes) | ||
32 | + AC_CHECK_HEADERS([sys/acl.h]) | ||
33 | + ;; | ||
34 | + no) ;; | ||
35 | + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; | ||
36 | + esac] | ||
37 | +) | ||
38 | + | ||
39 | AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], | ||
40 | [], [], [#include <stddef.h> | ||
41 | #include <sys/socket.h> | ||
42 | @@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then | ||
43 | [Define to 1 if the system provides __builtin_popcount function]) | ||
44 | fi | ||
45 | |||
46 | +AC_ARG_ENABLE([aio], | ||
47 | + [AS_HELP_STRING([--enable-aio], [turn on libaio support])], | ||
48 | + [case $enableval in | ||
49 | + yes) | ||
50 | + AC_CHECK_HEADERS([libaio.h], [ | ||
51 | + AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) | ||
52 | + AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) | ||
53 | + ]) | ||
54 | + ;; | ||
55 | + no) ;; | ||
56 | + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; | ||
57 | + esac] | ||
58 | +) | ||
59 | + | ||
60 | AC_PATH_PROG([PERL], [perl]) | ||
61 | |||
62 | dnl stack trace with libunwind | ||
63 | -- | ||
64 | 1.9.1 | ||
65 | |||