diff options
| -rw-r--r-- | meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace/Makefile-ptest.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace_4.17.bb (renamed from meta/recipes-devtools/strace/strace_4.16.bb) | 5 |
3 files changed, 47 insertions, 8 deletions
diff --git a/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch new file mode 100644 index 00000000000..1985d8104d5 --- /dev/null +++ b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch @@ -0,0 +1,31 @@ +From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 28 Jun 2017 11:36:57 -0700 +Subject: [PATCH 8/8] replace struct ucontext with ucontext_t + +glibc >= 2.26 has dropped the tag struct ucontext +from ucontext_t type + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linux/arm/arch_sigreturn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c +index b60dad8..a2b7100 100644 +--- a/linux/arm/arch_sigreturn.c ++++ b/linux/arm/arch_sigreturn.c +@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp) + #ifdef AARCH64 + tcp->currpers == 0 ? + (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO + +- offsetof(struct ucontext, uc_sigmask)) : ++ offsetof(ucontext_t, uc_sigmask)) : + #endif + (*arm_sp_ptr + + OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK); +-- +2.13.2 + diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 876c2d8629b..07ea0b37f24 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,19 +1,23 @@ -strace: Add ptest +From 0574ae9926308dcbca78bd8cd0f0f143f19cbcb5 Mon Sep 17 00:00:00 2001 +From: Gabriel Barbu <gabriel.barbu@enea.com> +Date: Thu, 25 Jul 2013 15:28:33 +0200 +Subject: [PATCH 4/8] strace: Add ptest Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> Signed-off-by: Chong Lu <Chong.Lu@windriver.com> + --- configure.ac | 2 +- tests/Makefile.am | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index b2b03c6..464a9dc 100644 +index 61d6425..6387c24 100644 --- a/configure.ac +++ b/configure.ac -@@ -39,7 +39,7 @@ AC_COPYRIGHT([Copyright (C) 1999-2017 The strace developers.]) +@@ -41,7 +41,7 @@ AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.]) AC_CONFIG_SRCDIR([strace.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) @@ -23,11 +27,11 @@ index b2b03c6..464a9dc 100644 AM_MAINTAINER_MODE AC_CANONICAL_HOST diff --git a/tests/Makefile.am b/tests/Makefile.am -index 311d3bb..72f9022 100644 +index 5aa7f89..a55a355 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -960,3 +960,21 @@ $(objects): scno.h - CLEANFILES = ksysent.h $(TESTS:=.tmp) +@@ -379,3 +379,21 @@ clean-local-check: + CLEANFILES = ksysent.h include ../scno.am + @@ -48,3 +52,6 @@ index 311d3bb..72f9022 100644 + sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ + done + for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done +-- +2.13.2 + diff --git a/meta/recipes-devtools/strace/strace_4.16.bb b/meta/recipes-devtools/strace/strace_4.17.bb index b6cd2ac9b9e..72fa9944890 100644 --- a/meta/recipes-devtools/strace/strace_4.16.bb +++ b/meta/recipes-devtools/strace/strace_4.17.bb @@ -13,10 +13,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ file://mips-SIGEMT.patch \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ + file://0008-replace-struct-ucontext-with-ucontext_t.patch \ " -SRC_URI[md5sum] = "2873366cac98770efcbed6e748d5ef23" -SRC_URI[sha256sum] = "98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef" +SRC_URI[md5sum] = "8d7eb10eba68bad83a269197e634b626" +SRC_URI[sha256sum] = "81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419" inherit autotools ptest bluetooth |