diff options
Diffstat (limited to 'meta/recipes-devtools/strace')
-rw-r--r-- | meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch | 60 | ||||
-rw-r--r-- | meta/recipes-devtools/strace/strace_4.8.bb | 9 |
2 files changed, 68 insertions, 1 deletions
diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch new file mode 100644 index 0000000000..27266d9052 --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.8/strace-add-configure-options.patch | |||
@@ -0,0 +1,60 @@ | |||
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 | |||
7 | --- strace-4.8/configure.ac.orig 2013-06-21 15:37:52.145892182 +0800 | ||
8 | +++ strace-4.8/configure.ac 2013-06-21 15:45:49.029909004 +0800 | ||
9 | @@ -219,7 +219,6 @@ AC_CHECK_HEADERS(m4_normalize([ | ||
10 | netinet/sctp.h | ||
11 | poll.h | ||
12 | stropts.h | ||
13 | - sys/acl.h | ||
14 | sys/asynch.h | ||
15 | sys/conf.h | ||
16 | sys/epoll.h | ||
17 | @@ -231,6 +230,19 @@ AC_CHECK_HEADERS(m4_normalize([ | ||
18 | sys/uio.h | ||
19 | sys/vfs.h | ||
20 | ])) | ||
21 | + | ||
22 | +AC_ARG_ENABLE([acl], | ||
23 | + [AS_HELP_STRING([--enable-acl], [turn on acl support])], | ||
24 | + [case $enableval in | ||
25 | + yes) | ||
26 | + AC_CHECK_HEADERS([sys/acl.h]) | ||
27 | + ;; | ||
28 | + no) ;; | ||
29 | + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; | ||
30 | + esac] | ||
31 | + | ||
32 | +) | ||
33 | + | ||
34 | AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h], | ||
35 | [], [], [#include <stddef.h> | ||
36 | #include <sys/socket.h> | ||
37 | @@ -301,10 +313,19 @@ AC_CHECK_SIZEOF([long]) | ||
38 | AC_CHECK_SIZEOF([long long]) | ||
39 | AC_CHECK_SIZEOF([rlim_t],,[#include <sys/resource.h>]) | ||
40 | |||
41 | -AC_CHECK_HEADERS([libaio.h], [ | ||
42 | - AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) | ||
43 | - AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) | ||
44 | -]) | ||
45 | +AC_ARG_ENABLE([aio], | ||
46 | + [AS_HELP_STRING([--enable-aio], [turn on libaio support])], | ||
47 | + [case $enableval in | ||
48 | + yes) | ||
49 | + AC_CHECK_HEADERS([libaio.h], [ | ||
50 | + AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>]) | ||
51 | + AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>]) | ||
52 | + ]) | ||
53 | + ;; | ||
54 | + no) ;; | ||
55 | + *) AC_MSG_ERROR([bad value $enableval for aio option]) ;; | ||
56 | + esac] | ||
57 | +) | ||
58 | |||
59 | AC_PATH_PROG([PERL], [perl]) | ||
60 | |||
diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb index c1ffdd1270..0f4d2f001e 100644 --- a/meta/recipes-devtools/strace/strace_4.8.bb +++ b/meta/recipes-devtools/strace/strace_4.8.bb | |||
@@ -6,12 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=124500c21e856f0912df29295ba104c7" | |||
6 | PR = "r0" | 6 | PR = "r0" |
7 | 7 | ||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ | 8 | SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ |
9 | file://git-version-gen" | 9 | file://git-version-gen \ |
10 | file://strace-add-configure-options.patch" | ||
10 | 11 | ||
11 | SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" | 12 | SRC_URI[md5sum] = "c575ef43829586801f514fd91bfe7575" |
12 | SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" | 13 | SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8" |
13 | inherit autotools | 14 | inherit autotools |
14 | 15 | ||
16 | PACKAGECONFIG_class-target ?= "libaio" | ||
17 | PACKAGECONFIG_class-target += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" | ||
18 | |||
19 | PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" | ||
20 | PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" | ||
21 | |||
15 | export INCLUDES = "-I. -I./linux" | 22 | export INCLUDES = "-I. -I./linux" |
16 | 23 | ||
17 | do_configure_prepend() { | 24 | do_configure_prepend() { |