| 1 |
commit: 75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Sun Jan 27 21:14:13 2019 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 28 13:41:21 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=75fbd9b9 |
| 7 |
|
| 8 |
sys-process/psmisc: add patchset from alpine to fix breakage |
| 9 |
|
| 10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 11 |
|
| 12 |
.../psmisc/files/psmisc-23.1-include_limits.patch | 45 ++++++++++++++++++++++ |
| 13 |
.../psmisc/files/psmisc-23.1-musl_ptregs.patch | 45 ++++++++++++++++++++++ |
| 14 |
sys-process/psmisc/psmisc-23.1-r1.ebuild | 5 +++ |
| 15 |
3 files changed, 95 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-process/psmisc/files/psmisc-23.1-include_limits.patch b/sys-process/psmisc/files/psmisc-23.1-include_limits.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..1b474bc |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-process/psmisc/files/psmisc-23.1-include_limits.patch |
| 22 |
@@ -0,0 +1,45 @@ |
| 23 |
+Author: Breno Leitao <brenohl@××××××.com> |
| 24 |
+Date: Thu Apr 6 13:59:57 2017 -0300 |
| 25 |
+ |
| 26 |
+ peekfd: Include headers for ppc64 |
| 27 |
+ |
| 28 |
+ Currently peekfd fails to build on ppc64le architecture with musl |
| 29 |
+ because it does not find reference for __WORDSIZE. |
| 30 |
+ |
| 31 |
+ This patch just includes reference for this macro if it was not |
| 32 |
+ previously defined. |
| 33 |
+ |
| 34 |
+Index: psmisc-22.21/src/peekfd.c |
| 35 |
+=================================================================== |
| 36 |
+--- psmisc-22.21.orig/src/peekfd.c |
| 37 |
++++ psmisc-22.21/src/peekfd.c |
| 38 |
+@@ -37,6 +37,14 @@ |
| 39 |
+ |
| 40 |
+ #include "i18n.h" |
| 41 |
+ |
| 42 |
++#if !defined(PATH_MAX) |
| 43 |
++#include <limits.h> |
| 44 |
++#endif |
| 45 |
++ |
| 46 |
++#if !defined(__WORDSIZE) |
| 47 |
++#include <bits/reg.h> |
| 48 |
++#endif |
| 49 |
++ |
| 50 |
+ #ifdef I386 |
| 51 |
+ #define REG_ORIG_ACCUM orig_eax |
| 52 |
+ #define REG_ACCUM eax |
| 53 |
+Index: psmisc-22.21/src/pstree.c |
| 54 |
+=================================================================== |
| 55 |
+--- psmisc-22.21.orig/src/pstree.c |
| 56 |
++++ psmisc-22.21/src/pstree.c |
| 57 |
+@@ -45,6 +45,10 @@ |
| 58 |
+ #include "i18n.h" |
| 59 |
+ #include "comm.h" |
| 60 |
+ |
| 61 |
++#if !defined(PATH_MAX) |
| 62 |
++#include <limits.h> |
| 63 |
++#endif |
| 64 |
++ |
| 65 |
+ #ifdef WITH_SELINUX |
| 66 |
+ #include <selinux/selinux.h> |
| 67 |
+ #else |
| 68 |
|
| 69 |
diff --git a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch |
| 70 |
new file mode 100644 |
| 71 |
index 0000000..1b474bc |
| 72 |
--- /dev/null |
| 73 |
+++ b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch |
| 74 |
@@ -0,0 +1,45 @@ |
| 75 |
+Author: Breno Leitao <brenohl@××××××.com> |
| 76 |
+Date: Thu Apr 6 13:59:57 2017 -0300 |
| 77 |
+ |
| 78 |
+ peekfd: Include headers for ppc64 |
| 79 |
+ |
| 80 |
+ Currently peekfd fails to build on ppc64le architecture with musl |
| 81 |
+ because it does not find reference for __WORDSIZE. |
| 82 |
+ |
| 83 |
+ This patch just includes reference for this macro if it was not |
| 84 |
+ previously defined. |
| 85 |
+ |
| 86 |
+Index: psmisc-22.21/src/peekfd.c |
| 87 |
+=================================================================== |
| 88 |
+--- psmisc-22.21.orig/src/peekfd.c |
| 89 |
++++ psmisc-22.21/src/peekfd.c |
| 90 |
+@@ -37,6 +37,14 @@ |
| 91 |
+ |
| 92 |
+ #include "i18n.h" |
| 93 |
+ |
| 94 |
++#if !defined(PATH_MAX) |
| 95 |
++#include <limits.h> |
| 96 |
++#endif |
| 97 |
++ |
| 98 |
++#if !defined(__WORDSIZE) |
| 99 |
++#include <bits/reg.h> |
| 100 |
++#endif |
| 101 |
++ |
| 102 |
+ #ifdef I386 |
| 103 |
+ #define REG_ORIG_ACCUM orig_eax |
| 104 |
+ #define REG_ACCUM eax |
| 105 |
+Index: psmisc-22.21/src/pstree.c |
| 106 |
+=================================================================== |
| 107 |
+--- psmisc-22.21.orig/src/pstree.c |
| 108 |
++++ psmisc-22.21/src/pstree.c |
| 109 |
+@@ -45,6 +45,10 @@ |
| 110 |
+ #include "i18n.h" |
| 111 |
+ #include "comm.h" |
| 112 |
+ |
| 113 |
++#if !defined(PATH_MAX) |
| 114 |
++#include <limits.h> |
| 115 |
++#endif |
| 116 |
++ |
| 117 |
+ #ifdef WITH_SELINUX |
| 118 |
+ #include <selinux/selinux.h> |
| 119 |
+ #else |
| 120 |
|
| 121 |
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild |
| 122 |
index bad4699..e52f2cb 100644 |
| 123 |
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild |
| 124 |
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild |
| 125 |
@@ -21,6 +21,11 @@ DEPEND="${RDEPEND} |
| 126 |
|
| 127 |
DOCS=( AUTHORS ChangeLog NEWS README ) |
| 128 |
|
| 129 |
+PATCHES=( |
| 130 |
+ "${FILESDIR}"/${P}-include_limits.patch |
| 131 |
+ "${FILESDIR}"/${P}-musl_ptregs.patch |
| 132 |
+) |
| 133 |
+ |
| 134 |
src_configure() { |
| 135 |
local myeconfargs=( |
| 136 |
$(use_enable selinux) |
Archives