From 817210ef57729bf0f3010328270ea4b954dfebcf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 18 Sep 2017 22:55:51 -0700 Subject: strace: Fix ptest bulds with musl/mips Signed-off-by: Khem Raj Signed-off-by: Ross Burton --- ...tion-Check-for-mips-and-alpha-before-usin.patch | 37 ++++++++++++++++++++++ meta/recipes-devtools/strace/strace_4.18.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch 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 @@ +From 9f3fd388ae7c46420bccba405468690ed46d669a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 18 Sep 2017 22:51:32 -0700 +Subject: [PATCH] tests/sigaction: Check for mips and alpha before using + sa_restorer + +local structure does not define restorer member for mips and alpha +in definition, we need to match that assumption here where they are +being set + +Fixes +| ../../strace-4.18/tests/sigaction.c:177:36: error: 'struct_set_sa {aka struct set_sa}' has no member named 'restorer' +| # define SA_RESTORER_ARGS , new_act->restorer + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + tests/sigaction.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/sigaction.c b/tests/sigaction.c +index 7b46944..f46cda7 100644 +--- a/tests/sigaction.c ++++ b/tests/sigaction.c +@@ -170,7 +170,7 @@ main(void) + sigdelset(mask.libc, SIGHUP); + + memcpy(new_act->mask, mask.old, sizeof(mask.old)); +-#ifdef SA_RESTORER ++#if defined(SA_RESTORER) && !defined(MIPS) && !defined(ALPHA) + new_act->flags = SA_RESTORER; + new_act->restorer = (unsigned long) 0xdeadfacecafef00dULL; + # define SA_RESTORER_FMT ", sa_flags=SA_RESTORER, sa_restorer=%#lx" +-- +2.14.1 + 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 \ 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://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \ " SRC_URI[md5sum] = "3579b3266bb096cebaefbe2cdb1a3a78" -- cgit 1.2.3-korg