From 2da906972ccbf32f27bcb8738166d1deeaf45d40 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 22 Dec 2019 23:42:18 +0000
Subject: system/psmisc: remove unneeded PPC patch

---
 system/psmisc/APKBUILD          |  4 +---
 system/psmisc/musl_ptregs.patch | 24 ------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 system/psmisc/musl_ptregs.patch

(limited to 'system')

diff --git a/system/psmisc/APKBUILD b/system/psmisc/APKBUILD
index bd86605fc..f8a16af1f 100644
--- a/system/psmisc/APKBUILD
+++ b/system/psmisc/APKBUILD
@@ -17,7 +17,6 @@ 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
 	fix-peekfd-on-ppc.patch
-	musl_ptregs.patch
 	"
 
 prepare() {
@@ -53,5 +52,4 @@ package() {
 }
 
 sha512sums="210dd327f1ff614587ff5b4ae60cd843426302a020fe7f1c018ddba99dcdff7b7ad0620e2b1f10f6204402c1dc0deebcb4332235bcca082d6be21dcb68043619  psmisc-23.2.tar.bz2
-a910611896368a088503f50a04a1c2af00d57ee20f3613e81c79cd89574805a505dff43e356ed833a464e3b59d7c1e11fd52cf0bbf32fcfece4dbd2380f23b71  fix-peekfd-on-ppc.patch
-57e3ebf427bae9d3ef5b40be1cbc29743009720a75369c91d338f7634fea5bf522f20ec54404b99f3a39e2c4c146c40baee2b22f68e5ede76678d488fde00db5  musl_ptregs.patch"
+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>
-
-- 
cgit v1.2.3-70-g09d2