aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Hughes <davidhughes205@gmail.com>2021-04-15 07:40:35 -0400
committerDave Hughes <davidhughes205@gmail.com>2021-04-15 07:58:29 -0400
commita62f26fff57075517cb58bd4ec7e6c5d7ce7bd09 (patch)
tree3ca6c81c46e3b4d93c933a44bcf12aaf3c30129a /sys-process
parentMisc cleanup, more to come. (diff)
downloadmusl-a62f26fff57075517cb58bd4ec7e6c5d7ce7bd09.tar.gz
musl-a62f26fff57075517cb58bd4ec7e6c5d7ce7bd09.tar.bz2
musl-a62f26fff57075517cb58bd4ec7e6c5d7ce7bd09.zip
sys-process/psmisc: fix patches
Bug: https://bugs.gentoo.org/782832 Closes: https://bugs.gentoo.org/782832 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Dave Hughes <davidhughes205@gmail.com>
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/psmisc/files/include_limits.patch45
-rw-r--r--sys-process/psmisc/psmisc-23.3-r1.ebuild6
-rw-r--r--sys-process/psmisc/psmisc-23.4.ebuild5
3 files changed, 47 insertions, 9 deletions
diff --git a/sys-process/psmisc/files/include_limits.patch b/sys-process/psmisc/files/include_limits.patch
new file mode 100644
index 0000000..1b474bc
--- /dev/null
+++ b/sys-process/psmisc/files/include_limits.patch
@@ -0,0 +1,45 @@
+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.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
index c4107d2..edc88ce 100644
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.3-r1.ebuild
@@ -21,15 +21,11 @@ BDEPEND=">=sys-devel/libtool-2.2.6b
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=(
- "${FILESDIR}"/include_limits.patch
- "${FILESDIR}"/musl_ptregs.patch
-)
-
src_prepare() {
default
if use elibc_musl ; then
+ eapply "${FILESDIR}"/include_limits.patch
eapply "${FILESDIR}"/musl_ptregs.patch
fi
diff --git a/sys-process/psmisc/psmisc-23.4.ebuild b/sys-process/psmisc/psmisc-23.4.ebuild
index be543f1..31edc94 100644
--- a/sys-process/psmisc/psmisc-23.4.ebuild
+++ b/sys-process/psmisc/psmisc-23.4.ebuild
@@ -22,14 +22,11 @@ BDEPEND=">=sys-devel/libtool-2.2.6b
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=(
- "${FILESDIR}"/include_limits.patch
-)
-
src_prepare() {
default
if use elibc_musl ; then
+ "${FILESDIR}"/include_limits.patch
"${FILESDIR}"/musl_ptregs.patch
fi