public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/
Date: Mon, 28 Jan 2019 13:41:39 +0000 (UTC)	[thread overview]
Message-ID: <1548682881.75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf.blueness@gentoo> (raw)

commit:     75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Jan 27 21:14:13 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 28 13:41:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=75fbd9b9

sys-process/psmisc: add patchset from alpine to fix breakage

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 .../psmisc/files/psmisc-23.1-include_limits.patch  | 45 ++++++++++++++++++++++
 .../psmisc/files/psmisc-23.1-musl_ptregs.patch     | 45 ++++++++++++++++++++++
 sys-process/psmisc/psmisc-23.1-r1.ebuild           |  5 +++
 3 files changed, 95 insertions(+)

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)


             reply	other threads:[~2019-01-28 19:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-28 13:41 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-31  1:21 [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/files/, sys-process/psmisc/ Georgy Yakovlev
2021-04-15 12:18 Dave Hughes
2021-04-13 13:24 Dave Hughes
2016-11-09 20:10 Aric Belsito

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1548682881.75fbd9b9e5ef9497cf1d85c85ff2a40a808894bf.blueness@gentoo \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox