[OE-core] [PATCH 2/2] strace: Fix aarch64 build with musl

[paul at betafive.co.uk]

From: Paul Barker <paul at betafive.co.uk>

Signed-off-by: Paul Barker <paul at betafive.co.uk>
---
 .../strace/strace/musl-fixes-armv8.patch      | 29 +++++++++++++++++++
 meta/recipes-devtools/strace/strace_4.26.bb   |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-devtools/strace/strace/musl-fixes-armv8.patch

diff --git a/meta/recipes-devtools/strace/strace/musl-fixes-armv8.patch b/meta/recipes-devtools/strace/strace/musl-fixes-armv8.patch
new file mode 100644
index 0000000000..185d1bef56
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/musl-fixes-armv8.patch
@@ -0,0 +1,29 @@
+Fixes on musl + armv8:
+
+error: redefinition of 'struct prctl_mm_map'
+ struct prctl_mm_map {
+        ^~~~~~~~~~~~
+In file included from work/aarch64-lmp-linux-musl/strace/4.26-r0/recipe-sysroot/usr/include/asm/ptrace.h:67,
+                 from work/aarch64-lmp-linux-musl/strace/4.26-r0/recipe-sysroot/usr/include/linux/ptrace.h:107,
+                 from ../strace-4.26/ptrace.h:36,
+                 from ../strace-4.26/strace.c:16:
+work/aarch64-lmp-linux-musl/strace/4.26-r0/recipe-sysroot/usr/include/linux/prctl.h:134:8: note: originally defined here
+ struct prctl_mm_map {
+        ^~~~~~~~~~~~
+
+[From: https://github.com/foundriesio/meta-lmp, thanks to Ricardo Salveti]
+Upstream-status: Pending
+Signed-off-by: Paul Barker <paul at betafive.co.uk>
+
+Index: strace-4.26/strace.c
+===================================================================
+--- strace-4.26.orig/strace.c
++++ strace-4.26/strace.c
+@@ -26,7 +26,7 @@
+ #include <locale.h>
+ #include <sys/utsname.h>
+ #ifdef HAVE_PRCTL
+-# include <sys/prctl.h>
++# include <linux/prctl.h>
+ #endif
+ #include <asm/unistd.h>
diff --git a/meta/recipes-devtools/strace/strace_4.26.bb b/meta/recipes-devtools/strace/strace_4.26.bb
index 24f92c99e5..b71122babf 100644
--- a/meta/recipes-devtools/strace/strace_4.26.bb
+++ b/meta/recipes-devtools/strace/strace_4.26.bb
@@ -15,6 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
            file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
            file://0001-tests-sigaction-Check-for-mips-and-alpha-before-usin.patch \
            file://0001-mips-o32-fix-build.patch \
+           file://musl-fixes-armv8.patch \
            "
 SRC_URI[md5sum] = "daa51acc0c7c696221ec03cf0b30a7af"
 SRC_URI[sha256sum] = "7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c"
-- 
2.17.1