summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-09-18 22:55:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 09:24:25 +0100
commit35258b6d3cd8354b628ce050e8f6c603700687c5 (patch)
treecdb1159c5fdc2e773138d818bffda0db743718f0 /meta/recipes-devtools/strace
parentbeb775ca75d2f0773049491338791c3906014cdb (diff)
downloadpoky-35258b6d3cd8354b628ce050e8f6c603700687c5.tar.gz
strace: Fix ptest bulds with musl/mips
(From OE-Core rev: 817210ef57729bf0f3010328270ea4b954dfebcf) 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>
Diffstat (limited to 'meta/recipes-devtools/strace')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch37
-rw-r--r--meta/recipes-devtools/strace/strace_4.18.bb1
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
new file mode 100644
index 0000000000..52096b28cf
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch
@@ -0,0 +1,37 @@
1From 9f3fd388ae7c46420bccba405468690ed46d669a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 18 Sep 2017 22:51:32 -0700
4Subject: [PATCH] tests/sigaction: Check for mips and alpha before using
5 sa_restorer
6
7local structure does not define restorer member for mips and alpha
8in definition, we need to match that assumption here where they are
9being set
10
11Fixes
12| ../../strace-4.18/tests/sigaction.c:177:36: error: 'struct_set_sa {aka struct set_sa}' has no member named 'restorer'
13| # define SA_RESTORER_ARGS , new_act->restorer
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17Upstream-Status: Pending
18
19 tests/sigaction.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/tests/sigaction.c b/tests/sigaction.c
23index 7b46944..f46cda7 100644
24--- a/tests/sigaction.c
25+++ b/tests/sigaction.c
26@@ -170,7 +170,7 @@ main(void)
27 sigdelset(mask.libc, SIGHUP);
28
29 memcpy(new_act->mask, mask.old, sizeof(mask.old));
30-#ifdef SA_RESTORER
31+#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA)
32 new_act->flags = SA_RESTORER;
33 new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL;
34 # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx"
35--
362.14.1
37
diff --git a/meta/recipes-devtools/strace/strace_4.18.bb b/meta/recipes-devtools/strace/strace_4.18.bb
index bbb82a9d84..4251b6ca90 100644
--- a/meta/recipes-devtools/strace/strace_4.18.bb
+++ b/meta/recipes-devtools/strace/strace_4.18.bb
@@ -13,6 +13,7 @@ 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://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78" 19SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78"