summaryrefslogtreecommitdiff
path: root/system/diffutils
diff options
context:
space:
mode:
Diffstat (limited to 'system/diffutils')
-rw-r--r--system/diffutils/APKBUILD8
-rw-r--r--system/diffutils/musl-ppc32.patch12
2 files changed, 17 insertions, 3 deletions
diff --git a/system/diffutils/APKBUILD b/system/diffutils/APKBUILD
index 3611ab71d..0264d56ed 100644
--- a/system/diffutils/APKBUILD
+++ b/system/diffutils/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer:
+# Maintainer: Zach van Rijn <me@zv.io>
pkgname=diffutils
pkgver=3.8
-pkgrel=0
+pkgrel=1
pkgdesc="Utility programs used for creating patch files"
url="https://www.gnu.org/software/diffutils/"
arch="all"
@@ -12,6 +12,7 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
disable-mbrtowc-test.patch
gnulib-tests-dont-require-gpg-passphrase.patch
+ musl-ppc32.patch
"
build() {
@@ -37,4 +38,5 @@ package() {
sha512sums="279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c diffutils-3.8.tar.xz
079d04f48fa5f5fd57eca8ba9ddefcdbb9e42a26dba7ca9b0a6f3f391112aa5ce34f0a32a931432f0ef0cc3345cc97de8310660cd05df9b30c38609440a729ee disable-mbrtowc-test.patch
-d45ab939e70b8b6e80d8950a8436be81e34e1067741196229edc7fbe33db92aa14532cf7490379741e779ae2cfc6010bec22dda2b2a046a3bc9eb68b94a0ff11 gnulib-tests-dont-require-gpg-passphrase.patch"
+d45ab939e70b8b6e80d8950a8436be81e34e1067741196229edc7fbe33db92aa14532cf7490379741e779ae2cfc6010bec22dda2b2a046a3bc9eb68b94a0ff11 gnulib-tests-dont-require-gpg-passphrase.patch
+249b62b0d3b166507103860122460d8c042c12bbf4c7fe883e2d0e2b90bd9f2ba387f444908aa874c9a06db72aea3e7dccefa0033c663088a0be015aaa077a9c musl-ppc32.patch"
diff --git a/system/diffutils/musl-ppc32.patch b/system/diffutils/musl-ppc32.patch
new file mode 100644
index 000000000..c1cd3dace
--- /dev/null
+++ b/system/diffutils/musl-ppc32.patch
@@ -0,0 +1,12 @@
+diff -ur a/lib/sigsegv.c b/lib/sigsegv.c
+--- a/lib/sigsegv.c 2022-01-08 21:35:58.620000000 +0000
++++ b/lib/sigsegv.c 2022-01-08 21:36:11.380000000 +0000
+@@ -222,7 +222,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
+