summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/m4/APKBUILD8
-rw-r--r--system/m4/fix-ppc-ucontext-regs.patch12
2 files changed, 17 insertions, 3 deletions
diff --git a/system/m4/APKBUILD b/system/m4/APKBUILD
index 130e290b8..90b5145c7 100644
--- a/system/m4/APKBUILD
+++ b/system/m4/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer:
+# Maintainer: Zach van Rijn <me@zv.io>
pkgname=m4
pkgver=1.4.19
-pkgrel=0
+pkgrel=1
pkgdesc="GNU macro processor"
url="https://www.gnu.org/software/m4"
arch="all"
@@ -15,6 +15,7 @@ source="https://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.gz
gnulib-tests-dont-require-gpg-passphrase.patch
m4-1.4.19-test-198.patch
posix-test.patch
+ fix-ppc-ucontext-regs.patch
"
build() {
@@ -39,4 +40,5 @@ sha512sums="f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb
c39562852502282f83b9bfa46aff00c8859b19d4d4335dbdb488748b10f6df6a13ea8291784683bf967674a5a824276419af47d2395e8af18823452a8d4999da disable-mbrtowc-test.patch
fb7344bc8a7aea1f1ce87474109aaf3d5a5ca0cd86b517025c6aad9a388a9ede7c267e7095d171d8768d1c0f0d9d8009e307467352afa81484c54dc476db0ebd gnulib-tests-dont-require-gpg-passphrase.patch
f409fcfd70d55c099bba7d784bea8f99cd6ccbfe24dfc3d76a2e757df96b6c71f7e4b42f63d433259e3bec7b7e40e6569533c032c98537003a6e7314754dd6fb m4-1.4.19-test-198.patch
-43c68f84c465b2e26a73ef0a5cf9bacafee70849f9de166eef45d7699438dce0ea3cacdd513daa8a8ae7fb677778290e2a78d01b551d9465de68eb167abcbc93 posix-test.patch"
+43c68f84c465b2e26a73ef0a5cf9bacafee70849f9de166eef45d7699438dce0ea3cacdd513daa8a8ae7fb677778290e2a78d01b551d9465de68eb167abcbc93 posix-test.patch
+0d40a28e2a4d40c5f18c317e4e6bce7fda2c7316249ebf102c585eda32d069a63a1fb5ced5efcba6d2beb2d68d54d67c6b2789f881bbb488899c95130e152744 fix-ppc-ucontext-regs.patch"
diff --git a/system/m4/fix-ppc-ucontext-regs.patch b/system/m4/fix-ppc-ucontext-regs.patch
new file mode 100644
index 000000000..d696da4ad
--- /dev/null
+++ b/system/m4/fix-ppc-ucontext-regs.patch
@@ -0,0 +1,12 @@
+diff -ur a/lib/sigsegv.c b/lib/sigsegv.c
+--- a/lib/sigsegv.c 2022-03-05 20:30:15.030000000 +0000
++++ b/lib/sigsegv.c 2022-03-05 20:42:49.910000000 +0000
+@@ -220,7 +220,7 @@
+ # if 0
+ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
+ # else
+-# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
++# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[1]
+ # endif
+ # endif
+