Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
Date: Thu, 03 Dec 2020 16:17:20
Message-Id: 1607012199.26953d8f33d17a68767ed678e282973f6850413a.anarchy@gentoo
1 commit: 26953d8f33d17a68767ed678e282973f6850413a
2 Author: stefson <herrtimson <AT> yahoo <DOT> de>
3 AuthorDate: Thu Dec 3 13:52:10 2020 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 3 16:16:39 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=26953d8f
7
8 sys-process/psmisc: remove duplicated patch
9
10 the same patch is applied twice, no idea how this went undetected for so long
11
12 Closes:https://github.com/gentoo/musl/pull/363
13
14 Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
15 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
16
17 .../psmisc/files/psmisc-23.1-musl_ptregs.patch | 45 ----------------------
18 sys-process/psmisc/psmisc-23.1-r1.ebuild | 1 -
19 2 files changed, 46 deletions(-)
20
21 diff --git a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
22 deleted file mode 100644
23 index 1b474bc..0000000
24 --- a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
25 +++ /dev/null
26 @@ -1,45 +0,0 @@
27 -Author: Breno Leitao <brenohl@××××××.com>
28 -Date: Thu Apr 6 13:59:57 2017 -0300
29 -
30 - peekfd: Include headers for ppc64
31 -
32 - Currently peekfd fails to build on ppc64le architecture with musl
33 - because it does not find reference for __WORDSIZE.
34 -
35 - This patch just includes reference for this macro if it was not
36 - previously defined.
37 -
38 -Index: psmisc-22.21/src/peekfd.c
39 -===================================================================
40 ---- psmisc-22.21.orig/src/peekfd.c
41 -+++ psmisc-22.21/src/peekfd.c
42 -@@ -37,6 +37,14 @@
43 -
44 - #include "i18n.h"
45 -
46 -+#if !defined(PATH_MAX)
47 -+#include <limits.h>
48 -+#endif
49 -+
50 -+#if !defined(__WORDSIZE)
51 -+#include <bits/reg.h>
52 -+#endif
53 -+
54 - #ifdef I386
55 - #define REG_ORIG_ACCUM orig_eax
56 - #define REG_ACCUM eax
57 -Index: psmisc-22.21/src/pstree.c
58 -===================================================================
59 ---- psmisc-22.21.orig/src/pstree.c
60 -+++ psmisc-22.21/src/pstree.c
61 -@@ -45,6 +45,10 @@
62 - #include "i18n.h"
63 - #include "comm.h"
64 -
65 -+#if !defined(PATH_MAX)
66 -+#include <limits.h>
67 -+#endif
68 -+
69 - #ifdef WITH_SELINUX
70 - #include <selinux/selinux.h>
71 - #else
72
73 diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
74 index ad05102..0b0046d 100644
75 --- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
76 +++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
77 @@ -23,7 +23,6 @@ DOCS=( AUTHORS ChangeLog NEWS README )
78
79 PATCHES=(
80 "${FILESDIR}"/${P}-include_limits.patch
81 - "${FILESDIR}"/${P}-musl_ptregs.patch
82 )
83
84 src_configure() {