mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

strace: drop unnecessary dependency on acl

Browse Source 
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.

  681452b0f8

(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>
This commit is contained in:
Andre McCurdy
2016-01-18 13:33:48 -08:00
committed by Richard Purdie
parent aadae7bef0
commit dd90f32706
2 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-devtools/strace/strace/strace-add-configure-options.patch
View File

@@ -1,4 +1,4 @@
Add options "aio" and "acl" to enable/disable libaio and acl support. Add option "aio" to enable/disable libaio support.
Upstream-Status: Pending Upstream-Status: Pending
@@ -12,26 +12,7 @@ diff --git a/configure.ac b/configure.ac
index e73958c..9099370 100644 index e73958c..9099370 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([ @@ -745,6 +745,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes;
sys/vfs.h
sys/xattr.h
]))
+
+AC_ARG_ENABLE([acl],
+ [AS_HELP_STRING([--enable-acl], [turn on acl support])],
+ [case $enableval in
+ yes)
+ AC_CHECK_HEADERS([sys/acl.h])
+ ;;
+ no) ;;
+ *) AC_MSG_ERROR([bad value $enableval for aio option]) ;;
+ esac]
+)
+
AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
[], [], [#include <stddef.h>
#include <sys/socket.h>
@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then
fi fi
AC_SUBST(dl_LIBS) AC_SUBST(dl_LIBS)
@@ -54,4 +35,3 @@ index e73958c..9099370 100644
dnl stack trace with libunwind dnl stack trace with libunwind
-- --
1.9.1 1.9.1

3
meta/recipes-devtools/strace/strace_4.10.bb
View File

@@ -21,12 +21,11 @@ inherit autotools ptest bluetooth
RDEPENDS_${PN}-ptest += "make coreutils grep gawk" RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
PACKAGECONFIG_class-target ??= "\ PACKAGECONFIG_class-target ??= "\
libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ libaio \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
" "
PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind" PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}" PACKAGECONFIG[bluez] = "ac_cv_header_bluetooth_bluetooth_h=yes,ac_cv_header_bluetooth_bluetooth_h=no,${BLUEZ}"