aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefson <herrtimson@yahoo.de>2020-12-03 14:52:10 +0100
committerJory Pratt <anarchy@gentoo.org>2020-12-03 10:16:39 -0600
commit26953d8f33d17a68767ed678e282973f6850413a (patch)
tree03f677ec8e506613f7b80a2a5477cb99a98d214a /sys-process
parentsys-libs/libcap: sys/prctl patch has been upstreamed (diff)
downloadmusl-26953d8f33d17a68767ed678e282973f6850413a.tar.gz
musl-26953d8f33d17a68767ed678e282973f6850413a.tar.bz2
musl-26953d8f33d17a68767ed678e282973f6850413a.zip
sys-process/psmisc: remove duplicated patch
the same patch is applied twice, no idea how this went undetected for so long Closes:https://github.com/gentoo/musl/pull/363 Signed-off-by: Steffen Kuhn <nielson2@yandex.com> Signed-off-by: Jory Pratt <anarchy@gentoo.org>
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch45
-rw-r--r--sys-process/psmisc/psmisc-23.1-r1.ebuild1
2 files changed, 0 insertions, 46 deletions
diff --git a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
deleted file mode 100644
index 1b474bc..0000000
--- a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Breno Leitao <brenohl@br.ibm.com>
-Date: Thu Apr 6 13:59:57 2017 -0300
-
- peekfd: Include headers for ppc64
-
- Currently peekfd fails to build on ppc64le architecture with musl
- because it does not find reference for __WORDSIZE.
-
- This patch just includes reference for this macro if it was not
- previously defined.
-
-Index: psmisc-22.21/src/peekfd.c
-===================================================================
---- psmisc-22.21.orig/src/peekfd.c
-+++ psmisc-22.21/src/peekfd.c
-@@ -37,6 +37,14 @@
-
- #include "i18n.h"
-
-+#if !defined(PATH_MAX)
-+#include <limits.h>
-+#endif
-+
-+#if !defined(__WORDSIZE)
-+#include <bits/reg.h>
-+#endif
-+
- #ifdef I386
- #define REG_ORIG_ACCUM orig_eax
- #define REG_ACCUM eax
-Index: psmisc-22.21/src/pstree.c
-===================================================================
---- psmisc-22.21.orig/src/pstree.c
-+++ psmisc-22.21/src/pstree.c
-@@ -45,6 +45,10 @@
- #include "i18n.h"
- #include "comm.h"
-
-+#if !defined(PATH_MAX)
-+#include <limits.h>
-+#endif
-+
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
- #else
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index ad05102..0b0046d 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -23,7 +23,6 @@ DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=(
"${FILESDIR}"/${P}-include_limits.patch
- "${FILESDIR}"/${P}-musl_ptregs.patch
)
src_configure() {