From 6eecb5ff5a154ae2d0a512fb01ba42ac0072f9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 11 Jul 2021 20:18:33 +0200
Subject: [PATCH] testing/a2jmidid: fix build on riscv64
---
testing/a2jmidid/APKBUILD | 10 +++++++---
testing/a2jmidid/riscv.patch | 12 ++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 testing/a2jmidid/riscv.patch
diff --git a/testing/a2jmidid/APKBUILD b/testing/a2jmidid/APKBUILD
index ddbd782de3b0..f6c5024a2eb7 100644
--- a/testing/a2jmidid/APKBUILD
+++ b/testing/a2jmidid/APKBUILD
@@ -11,7 +11,8 @@ depends="py3-dbus"
makedepends="meson libexecinfo-dev jack-dev alsa-lib-dev dbus-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/jackaudio/a2jmidid/archive/$pkgver.tar.gz
- check-for-libc-backtrace.patch"
+ check-for-libc-backtrace.patch
+ riscv.patch"
options="!check" # No testsuite
build() {
@@ -23,5 +24,8 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
-sha512sums="5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c a2jmidid-9.tar.gz
-0639c8f2070a8af2872a073c255f0d4dca709363457c726fc0824a6574ca479a78a079a2f71dac18b2f0fa738a8f96ce261984a88687ad804f45a0aad81a869f check-for-libc-backtrace.patch"
+sha512sums="
+5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c a2jmidid-9.tar.gz
+0639c8f2070a8af2872a073c255f0d4dca709363457c726fc0824a6574ca479a78a079a2f71dac18b2f0fa738a8f96ce261984a88687ad804f45a0aad81a869f check-for-libc-backtrace.patch
+4664c339daf6e4342ff42ed884fe2b4e57c7ad08c86ac5b01ac928be35e6b143f9816736df9845a2c95855001249af7187aefdefc680176e9286c2e82064758a riscv.patch
+"
diff --git a/testing/a2jmidid/riscv.patch b/testing/a2jmidid/riscv.patch
new file mode 100644
index 000000000000..705ed7741fdf
--- /dev/null
+++ b/testing/a2jmidid/riscv.patch
@@ -0,0 +1,12 @@
+diff -upr a2jmidid-9.orig/sigsegv.c a2jmidid-9/sigsegv.c
+--- a2jmidid-9.orig/sigsegv.c 2021-07-11 11:43:22.326350510 +0200
++++ a2jmidid-9/sigsegv.c 2021-07-11 11:43:34.907756185 +0200
+@@ -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__) && !defined(__powerpc64__)
--
GitLab