aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstefson <herrtimson@yahoo.de>2019-01-27 22:14:13 +0100
committerAnthony G. Basile <blueness@gentoo.org>2019-01-28 08:41:21 -0500
commit75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf (patch)
tree2b573c1875e6900ac684486b93efea2c6a3d7182 /sys-process
parentsys-process/psmisc: resync ebuild with ebuild from tree (diff)
downloadmusl-75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf.tar.gz
musl-75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf.tar.bz2
musl-75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf.zip
sys-process/psmisc: add patchset from alpine to fix breakage
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-process')
-rw-r--r--sys-process/psmisc/files/psmisc-23.1-include_limits.patch45
-rw-r--r--sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch45
-rw-r--r--sys-process/psmisc/psmisc-23.1-r1.ebuild5
3 files changed, 95 insertions, 0 deletions
diff --git a/sys-process/psmisc/files/psmisc-23.1-include_limits.patch b/sys-process/psmisc/files/psmisc-23.1-include_limits.patch
new file mode 100644
index 0000000..1b474bc
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.1-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/files/psmisc-23.1-musl_ptregs.patch b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
new file mode 100644
index 0000000..1b474bc
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.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.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index bad4699..e52f2cb 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
+PATCHES=(
+ "${FILESDIR}"/${P}-include_limits.patch
+ "${FILESDIR}"/${P}-musl_ptregs.patch
+)
+
src_configure() {
local myeconfargs=(
$(use_enable selinux)