summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-06-28 21:59:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:14 +0100
commit451c4649bbf384cd80af7a1552dc1f656ed2ce90 (patch)
tree26e89ce83e24fa6054ccb6d4af0d02b21544508b
parent8dec4ffdd2cc0cd4827aed8855370a6928488c87 (diff)
downloadpoky-451c4649bbf384cd80af7a1552dc1f656ed2ce90.tar.gz
strace: upgrade to 4.17
Fix build with upcoming glibc 2.26 (From OE-Core rev: 8a4a62ae44d6819cda77c96a5106b78a83364fd6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch31
-rw-r--r--meta/recipes-devtools/strace/strace/Makefile-ptest.patch19
-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 0000000000..1985d8104d
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0008-replace-struct-ucontext-with-ucontext_t.patch
@@ -0,0 +1,31 @@
1From 07f71a12cb88919c6113284fc43bf4967e5e2bc1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 28 Jun 2017 11:36:57 -0700
4Subject: [PATCH 8/8] replace struct ucontext with ucontext_t
5
6glibc >= 2.26 has dropped the tag struct ucontext
7from ucontext_t type
8
9Upstream-Status: Submitted
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 linux/arm/arch_sigreturn.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/linux/arm/arch_sigreturn.c b/linux/arm/arch_sigreturn.c
17index b60dad8..a2b7100 100644
18--- a/linux/arm/arch_sigreturn.c
19+++ b/linux/arm/arch_sigreturn.c
20@@ -9,7 +9,7 @@ arch_sigreturn(struct tcb *tcp)
21 #ifdef AARCH64
22 tcp->currpers == 0 ?
23 (*aarch64_sp_ptr + SIZEOF_STRUCT_SIGINFO +
24- offsetof(struct ucontext, uc_sigmask)) :
25+ offsetof(ucontext_t, uc_sigmask)) :
26 #endif
27 (*arm_sp_ptr +
28 OFFSETOF_STRUCT_UCONTEXT_UC_SIGMASK);
29--
302.13.2
31
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 876c2d8629..07ea0b37f2 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,19 +1,23 @@
1strace: Add ptest 1From 0574ae9926308dcbca78bd8cd0f0f143f19cbcb5 Mon Sep 17 00:00:00 2001
2From: Gabriel Barbu <gabriel.barbu@enea.com>
3Date: Thu, 25 Jul 2013 15:28:33 +0200
4Subject: [PATCH 4/8] strace: Add ptest
2 5
3Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
4 7
5Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com> 8Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
6Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 9Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
10
7--- 11---
8 configure.ac | 2 +- 12 configure.ac | 2 +-
9 tests/Makefile.am | 18 ++++++++++++++++++ 13 tests/Makefile.am | 18 ++++++++++++++++++
10 2 files changed, 19 insertions(+), 1 deletion(-) 14 2 files changed, 19 insertions(+), 1 deletion(-)
11 15
12diff --git a/configure.ac b/configure.ac 16diff --git a/configure.ac b/configure.ac
13index b2b03c6..464a9dc 100644 17index 61d6425..6387c24 100644
14--- a/configure.ac 18--- a/configure.ac
15+++ b/configure.ac 19+++ b/configure.ac
16@@ -39,7 +39,7 @@ AC_COPYRIGHT([Copyright (C) 1999-2017 The strace developers.]) 20@@ -41,7 +41,7 @@ AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.])
17 AC_CONFIG_SRCDIR([strace.c]) 21 AC_CONFIG_SRCDIR([strace.c])
18 AC_CONFIG_AUX_DIR([.]) 22 AC_CONFIG_AUX_DIR([.])
19 AC_CONFIG_HEADERS([config.h]) 23 AC_CONFIG_HEADERS([config.h])
@@ -23,11 +27,11 @@ index b2b03c6..464a9dc 100644
23 AM_MAINTAINER_MODE 27 AM_MAINTAINER_MODE
24 AC_CANONICAL_HOST 28 AC_CANONICAL_HOST
25diff --git a/tests/Makefile.am b/tests/Makefile.am 29diff --git a/tests/Makefile.am b/tests/Makefile.am
26index 311d3bb..72f9022 100644 30index 5aa7f89..a55a355 100644
27--- a/tests/Makefile.am 31--- a/tests/Makefile.am
28+++ b/tests/Makefile.am 32+++ b/tests/Makefile.am
29@@ -960,3 +960,21 @@ $(objects): scno.h 33@@ -379,3 +379,21 @@ clean-local-check:
30 CLEANFILES = ksysent.h $(TESTS:=.tmp) 34 CLEANFILES = ksysent.h
31 35
32 include ../scno.am 36 include ../scno.am
33+ 37+
@@ -48,3 +52,6 @@ index 311d3bb..72f9022 100644
48+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \ 52+ sed -i -e 's/$${srcdir=.}/./g' $(DESTDIR)/$(TESTDIR)/$$file; \
49+ done 53+ done
50+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done 54+ for i in net net-fd scm_rights-fd sigaction; do sed -i -e 's/$$srcdir/./g' $(DESTDIR)/$(TESTDIR)/$$i.test; done
55--
562.13.2
57
diff --git a/meta/recipes-devtools/strace/strace_4.16.bb b/meta/recipes-devtools/strace/strace_4.17.bb
index b6cd2ac9b9..72fa994489 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 \
13 file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \ 13 file://0001-Fix-build-when-using-non-glibc-libc-implementation-o.patch \
14 file://mips-SIGEMT.patch \ 14 file://mips-SIGEMT.patch \
15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 15 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
16 file://0008-replace-struct-ucontext-with-ucontext_t.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "2873366cac98770efcbed6e748d5ef23" 19SRC_URI[md5sum] = "8d7eb10eba68bad83a269197e634b626"
19SRC_URI[sha256sum] = "98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef" 20SRC_URI[sha256sum] = "81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419"
20 21
21inherit autotools ptest bluetooth 22inherit autotools ptest bluetooth
22 23