From 7b5e19ba4db36db498be73a99315e0ac26c6511f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Oct 2019 21:53:56 -0700 Subject: a2jmidid: Fix build on risv Fixes ../a2jmidid-8/sigsegv.c:102:39: error: no member named 'gregs' in 'struct mcontext_t' | ucontext->uc_mcontext.gregs[i] | ~~~~~~~~~~~~~~~~~~~~~ ^ Signed-off-by: Khem Raj --- .../jack/a2jmidid/riscv_ucontext.patch | 24 ++++++++++++++++++++++ meta-oe/recipes-multimedia/jack/a2jmidid_8.bb | 1 + 2 files changed, 25 insertions(+) create mode 100644 meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch b/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch new file mode 100644 index 0000000000..23618f18a1 --- /dev/null +++ b/meta-oe/recipes-multimedia/jack/a2jmidid/riscv_ucontext.patch @@ -0,0 +1,24 @@ +Add riscv specific checks to choose correct gregs and context structure definitions + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/sigsegv.c ++++ b/sigsegv.c +@@ -91,7 +91,7 @@ static void signal_segv(int signum, sigi + a2j_error("info.si_errno = %d", info->si_errno); + a2j_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]); + a2j_error("info.si_addr = %p", info->si_addr); +-#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) ++#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) && !defined(__riscv) + for(i = 0; i < NGREG; i++) + a2j_error("reg[%02d] = 0x" REGFORMAT, i, + #if defined(__powerpc__) +@@ -102,7 +102,7 @@ static void signal_segv(int signum, sigi + ucontext->uc_mcontext.gregs[i] + #endif + ); +-#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 */ ++#endif /* alpha, ia64, kFreeBSD, arm, hppa aarch64 riscv */ + + #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) + # if defined(SIGSEGV_STACK_IA64) diff --git a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb index 7dcaaf6828..a0aa412232 100644 --- a/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb +++ b/meta-oe/recipes-multimedia/jack/a2jmidid_8.bb @@ -13,6 +13,7 @@ SRC_URI = " \ http://download.gna.org/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-wscript-add-pthread-library-dependency-to-fix-linkin.patch \ file://0002-aarch64.patch \ + file://riscv_ucontext.patch \ " SRC_URI[md5sum] = "9cf4edbc3ad2ddeeaf6c8c1791ff3ddd" SRC_URI[sha256sum] = "2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f" -- cgit 1.2.3-korg