[meta-oe,3/6] a2jmidid: Fix build on ppc/musl

Message ID 20220327011432.555592-3-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/6] rocksdb: Exclude on ppc/musl | expand

Commit Message

Khem Raj March 27, 2022, 1:14 a.m. UTC
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../jack/a2jmidid/ppc_musl_ucontext.patch     | 19 +++++++++++++++++++
 meta-oe/recipes-multimedia/jack/a2jmidid_9.bb |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch

Patch

diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch b/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch
new file mode 100644
index 0000000000..1fa64812ef
--- /dev/null
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid/ppc_musl_ucontext.patch
@@ -0,0 +1,19 @@ 
+Add musl/ppc mcontext differences specific checks to choose
+correct gregs and context structure definitions
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/sigsegv.c
++++ b/sigsegv.c
+@@ -95,7 +95,11 @@ static void signal_segv(int signum, sigi
+     for(i = 0; i < NGREG; i++)
+         a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
+ #if defined(__powerpc__) && !defined(__powerpc64__)
++# if defined(__GLIBC__)
+                 ucontext->uc_mcontext.uc_regs[i]
++# else
++                ucontext->uc_regs->gregs[i]
++# endif
+ #elif defined(__powerpc64__)
+                 ucontext->uc_mcontext.gp_regs[i]
+ #elif defined(__sparc__) && defined(__arch64__)
diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
index 339145dd0c..bfdf26ed46 100644
--- a/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
+++ b/meta-oe/recipes-multimedia/jack/a2jmidid_9.bb
@@ -13,6 +13,7 @@  SRCREV = "de37569c926c5886768f892c019e3f0468615038"
 SRC_URI = " \
     git://github.com/linuxaudio/a2jmidid;protocol=https;branch=master \
     file://riscv_ucontext.patch \
+    file://ppc_musl_ucontext.patch \
 "
 
 S = "${WORKDIR}/git"