summaryrefslogtreecommitdiff
path: root/system/psmisc
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-22 21:28:35 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-22 21:28:35 +0000
commit37cdc8fcf679a65b4180d26971ef75e0cdd12194 (patch)
treefd82c286885569fa1b4c985134cc7cc941dfc2a5 /system/psmisc
parentaa64aaf6421e56ecef3fc6b021ff216567cf14f2 (diff)
downloadpackages-37cdc8fcf679a65b4180d26971ef75e0cdd12194.tar.gz
packages-37cdc8fcf679a65b4180d26971ef75e0cdd12194.tar.bz2
packages-37cdc8fcf679a65b4180d26971ef75e0cdd12194.tar.xz
packages-37cdc8fcf679a65b4180d26971ef75e0cdd12194.zip
system/psmisc: attempt to fix ARMv7 build
Diffstat (limited to 'system/psmisc')
-rw-r--r--system/psmisc/APKBUILD5
-rw-r--r--system/psmisc/musl_ptregs.patch6
2 files changed, 7 insertions, 4 deletions
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD
index 461b6bc6d..8eb5be7d5 100644
--- a/system/psmisc/APKBUILD
+++ b/system/psmisc/APKBUILD
@@ -1,9 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-
pkgname=psmisc
pkgver=23.1
-pkgrel=0
+pkgrel=1
pkgdesc="Miscellaneous utilities that use the proc filesystem"
url="https://gitlab.com/psmisc/psmisc"
arch="all"
@@ -58,4 +57,4 @@ package() {
sha512sums="636f33b628f07599c7a08d0fe0e084469647e2b03046f9c220f6a24475ab1d5dd07db2501bc1a581ca68c72c212367b5dab8b44edfe477a70bfc8740af2b1365 psmisc-23.1.tar.bz2
a68c75eb3c66a9df0d4e574a9439eeed0cd2dc97b3cad3fcd8b945619c2ec238b73bf479d1b55ddd4821471cd8934ee1fbc7871c92de7ef72c3d3f989ab62c9f dont-underlink-peekfd.patch
b16139606e1ccaebd94b7b7a14f49f530b180f1fd24338008e4c4d48761b57953458c46e57b0f7ec191353514f68126f79c281875c4cd56ed2f1220ace131ce1 fix-peekfd-on-ppc.patch
-73dec9791e8cdb85cd3d9ef9be4d16e0fef481c6edc334ed9e954829444b1a92b87f7a3a2e6c1d09ac207bed828f214f5f2a95caa66540a7f2a6c58a6b8f6f2c musl_ptregs.patch"
+57e3ebf427bae9d3ef5b40be1cbc29743009720a75369c91d338f7634fea5bf522f20ec54404b99f3a39e2c4c146c40baee2b22f68e5ede76678d488fde00db5 musl_ptregs.patch"
diff --git a/system/psmisc/musl_ptregs.patch b/system/psmisc/musl_ptregs.patch
index 29fee6a2a..280181a58 100644
--- a/system/psmisc/musl_ptregs.patch
+++ b/system/psmisc/musl_ptregs.patch
@@ -7,13 +7,17 @@ Index: psmisc-22.21/src/peekfd.c
===================================================================
--- a/src/peekfd.c.old
+++ b/src/peekfd.c
-@@ -27,7 +27,9 @@
+@@ -27,7 +27,13 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/syscall.h>
++#ifdef __PPC__
+#define pt_regs uapi_pt_regs
++#endif
#include <asm/ptrace.h>
++#ifdef __PPC__
+#undef pt_regs
++#endif
#include <byteswap.h>
#include <endian.h>
#include <sys/user.h>