strace: 4.9 -> 4.10

Updated patches:
Makefile-ptest.patch
strace-add-configure-options.patch

Fixed:
debugedit: netlink_unix_diag: canonicalization unexpectedly shrank by one character

It was because oe_runmake -C ${TESTDIR} buildtest-TESTS didn't set OS
and ARCH, which caused "-I<foo>//" in gcc options, and would cause
debugedit error.

(From OE-Core rev: af76eb0405352d66dfd00d7f856f401d892855e1)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2015-04-07 04:24:22 -07:00 committed by Richard Purdie
parent 6cd8c8d746
commit 5169721033
5 changed files with 15 additions and 25 deletions

View File

@ -10,7 +10,7 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 054f85b..9aec566 100644
index e73958c..5f0dfee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT([strace],
@ -23,11 +23,11 @@ index 054f85b..9aec566 100644
AC_CANONICAL_HOST
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 922452a..b17837f 100644
index ff5e136..984bdb6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,3 +37,21 @@ TEST_LOG_COMPILER = $(srcdir)/run.sh
EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS)
@@ -101,3 +101,21 @@ EXTRA_DIST = init.sh run.sh \
$(TESTS)
CLEANFILES = $(TESTS:=.tmp)
+

View File

@ -5,24 +5,16 @@ Upstream-Status: Pending
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
configure.ac | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
configure.ac | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/configure.ac b/configure.ac
index 054f85b..8ed49f1 100644
index e73958c..9099370 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,7 +238,6 @@ AC_CHECK_HEADERS(m4_normalize([
poll.h
scsi/sg.h
stropts.h
- sys/acl.h
sys/asynch.h
sys/conf.h
sys/epoll.h
@@ -250,6 +249,18 @@ AC_CHECK_HEADERS(m4_normalize([
sys/uio.h
@@ -270,6 +270,18 @@ AC_CHECK_HEADERS(m4_normalize([
sys/vfs.h
sys/xattr.h
]))
+
+AC_ARG_ENABLE([acl],
@ -39,9 +31,9 @@ index 054f85b..8ed49f1 100644
AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
[], [], [#include <stddef.h>
#include <sys/socket.h>
@@ -649,6 +660,20 @@ if test "x$st_cv_have___builtin_popcount" = xyes; then
[Define to 1 if the system provides __builtin_popcount function])
@@ -745,6 +757,20 @@ if test "x$ac_cv_lib_dl_dladdr" = xyes; then
fi
AC_SUBST(dl_LIBS)
+AC_ARG_ENABLE([aio],
+ [AS_HELP_STRING([--enable-aio], [turn on libaio support])],
@ -60,6 +52,6 @@ index 054f85b..8ed49f1 100644
AC_PATH_PROG([PERL], [perl])
dnl stack trace with libunwind
--
--
1.9.1

View File

@ -11,8 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
file://run-ptest \
"
SRC_URI[md5sum] = "885eafadb10f6c60464a266d3929a2a4"
SRC_URI[sha256sum] = "095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65"
SRC_URI[md5sum] = "107a5be455493861189e9b57a3a51912"
SRC_URI[sha256sum] = "e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2"
inherit autotools ptest
RDEPENDS_${PN}-ptest += "make coreutils grep gawk"
@ -23,8 +23,6 @@ PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
PACKAGECONFIG[libunwind] = "--with-libunwind, --without-libunwind, libunwind"
export INCLUDES = "-I. -I./linux"
TESTDIR = "tests"
do_configure_prepend() {
@ -37,7 +35,7 @@ do_install_append() {
}
do_compile_ptest() {
oe_runmake -C ${TESTDIR} buildtest-TESTS
oe_runmake -C ${TESTDIR} buildtest-TESTS OS=linux ARCH="${TARGET_ARCH}"
}
do_install_ptest() {