summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-18 13:33:48 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:15 +0000
commitdd90f32706fae3af036e4a38756de2d5e297e82b (patch)
treef9fa22a9e419d9964db2fb306d85a09c3e7fb4fc /meta/recipes-devtools
parentaadae7bef0355b7affd8bfa2ce1b9d30f86a6c8c (diff)
downloadpoky-dd90f32706fae3af036e4a38756de2d5e297e82b.tar.gz
strace: drop unnecessary dependency on acl
The dependency on acl was removed from strace prior to the v4.10 release, so it's no longer necessary to add a configure option to allow acl to be disabled. http://sourceforge.net/p/strace/code/ci/681452b0f854833d4bd443fcd9bb0bab2b46339f (From OE-Core rev: 18dbd28d638ee4b50de5a7a1aca00f3277fdb42e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/strace/strace/strace-add-configure-options.patch24
-rw-r--r--meta/recipes-devtools/strace/strace_4.10.bb3
2 files changed, 3 insertions, 24 deletions
diff --git a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
index e48e4b31b9..a3f8ec463d 100644
--- a/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
+++ b/meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
@@ -1,4 +1,4 @@
1Add options "aio" and "acl" to enable/disable libaio and acl support. 1Add option "aio" to enable/disable libaio support.
2 2
3Upstream-Status: Pending 3Upstream-Status: Pending
4 4
@@ -12,26 +12,7 @@ diff --git a/configure.ac b/configure.ac
12index e73958c..9099370 100644 12index e73958c..9099370 100644
13--- a/configure.ac 13--- a/configure.ac
14+++ b/configure.ac 14+++ b/configure.ac
15@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([ 15@@ -745,6 +745,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes;
16 sys/vfs.h
17 sys/xattr.h
18 ]))
19+
20+AC_ARG_ENABLE([acl],
21+ [AS_HELP_STRING([--enable-acl], [turn on acl support])],
22+ [case $enableval in
23+ yes)
24+ AC_CHECK_HEADERS([sys/acl.h])
25+ ;;
26+ no) ;;
27+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;;
28+ esac]
29+)
30+
31 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
32 [], [], [#include <stddef.h>
33 #include <sys/socket.h>
34@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then
35 fi 16 fi
36 AC_SUBST(dl_LIBS) 17 AC_SUBST(dl_LIBS)
37 18
@@ -54,4 +35,3 @@ index e73958c..9099370 100644
54 dnl stack trace with libunwind 35 dnl stack trace with libunwind
55-- 36--
561.9.1 371.9.1
57
diff --git a/meta/recipes-devtools/strace/strace_4.10.bb b/meta/recipes-devtools/strace/strace_4.10.bb
index 20b7e3d0a5..fe250b771c 100644
--- a/meta/recipes-devtools/strace/strace_4.10.bb
+++ b/meta/recipes-devtools/strace/strace_4.10.bb
@@ -21,12 +21,11 @@ inherit autotools ptest bluetooth
21RDEPENDS_${PN}-ptest += "make coreutils grep gawk" 21RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
22 22
23PACKAGECONFIG_class-target ??= "\ 23PACKAGECONFIG_class-target ??= "\
24 libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ 24 libaio \
25 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 25 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
26" 26"
27 27
28PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" 28PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
29PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
30PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind" 29PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
31PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" 30PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}"
32 31