diff options
Diffstat (limited to 'system/psmisc')
| -rw-r--r-- | system/psmisc/APKBUILD | 23 | ||||
| -rw-r--r-- | system/psmisc/musl_ptregs.patch | 24 |
2 files changed, 8 insertions, 39 deletions
diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD index f98d21cf1..b80969030 100644 --- a/system/psmisc/APKBUILD +++ b/system/psmisc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=psmisc -pkgver=23.2 +pkgver=23.6 pkgrel=0 pkgdesc="Miscellaneous utilities that use the proc filesystem" url="https://gitlab.com/psmisc/psmisc" @@ -9,27 +9,23 @@ arch="all" options="!check" # killall(8) is known-broken on musl: # https://gitlab.com/psmisc/psmisc/issues/18 license="GPL-2.0+" +depends="" +checkdepends="dejagnu" makedepends_build="autoconf>=2.69 automake" makedepends_host="ncurses-dev" -checkdepends="dejagnu" subpackages="$pkgname-doc" [ "$CBUILD" != "$CHOST" ] || subpackages="$subpackages $pkgname-lang" -source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/$pkgname/$pkgname/repository/archive.tar.bz2?ref=v$pkgver +source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/psmisc/psmisc/-/archive/v$pkgver/psmisc-v$pkgver.tar.bz2 fix-peekfd-on-ppc.patch - musl_ptregs.patch " +builddir="$srcdir/$pkgname-v$pkgver" prepare() { - ln -fs $pkgname-v$pkgver-* "$builddir" - default_prepare - - cd "$builddir" sh autogen.sh } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -46,15 +42,12 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="210dd327f1ff614587ff5b4ae60cd843426302a020fe7f1c018ddba99dcdff7b7ad0620e2b1f10f6204402c1dc0deebcb4332235bcca082d6be21dcb68043619 psmisc-23.2.tar.bz2 -a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch -57e3ebf427bae9d3ef5b40be1cbc29743009720a75369c91d338f7634fea5bf522f20ec54404b99f3a39e2c4c146c40baee2b22f68e5ede76678d488fde00db5 musl_ptregs.patch" +sha512sums="17ee04c2ce8bd5107b583069853dbf296ecbbf5b3bfb395d02e35691212de453e8b8cae15666a61a3041487cc0e4d1a6e7fbe105afc3a0114bd5b19682efa17a psmisc-23.6.tar.bz2 +a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71 fix-peekfd-on-ppc.patch" diff --git a/system/psmisc/musl_ptregs.patch b/system/psmisc/musl_ptregs.patch deleted file mode 100644 index 280181a58..000000000 --- a/system/psmisc/musl_ptregs.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Breno Leitao <brenohl@br.ibm.com> -Date: Thu Apr 6 14:03:00 2017 -0300 - - peekfd: Avoid pt_regs clash - -Index: psmisc-22.21/src/peekfd.c -=================================================================== ---- a/src/peekfd.c.old -+++ b/src/peekfd.c -@@ -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> - |