From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1228200-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2E8671382C5
for <garchives@archives.gentoo.org>; Thu, 3 Dec 2020 16:17:20 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 59801E079E;
Thu, 3 Dec 2020 16:17:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3D805E079E
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Dec 2020 16:17:19 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EFE9E34130A
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Dec 2020 16:17:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 644B346A
for <gentoo-commits@lists.gentoo.org>; Thu, 3 Dec 2020 16:17:16 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" <anarchy@gentoo.org>
Message-ID: <1607012199.26953d8f33d17a68767ed678e282973f6850413a.anarchy@gentoo>
Subject: [gentoo-commits] proj/musl:master commit in: sys-process/psmisc/, sys-process/psmisc/files/
X-VCS-Repository: proj/musl
X-VCS-Files: sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch sys-process/psmisc/psmisc-23.1-r1.ebuild
X-VCS-Directories: sys-process/psmisc/files/ sys-process/psmisc/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: 26953d8f33d17a68767ed678e282973f6850413a
X-VCS-Branch: master
Date: Thu, 3 Dec 2020 16:17:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a2dc3470-9be1-4c2d-acc0-5295a27e09a0
X-Archives-Hash: 80dae8c13ab5ee7f1300ab53c37519ff
commit: 26953d8f33d17a68767ed678e282973f6850413a
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Thu Dec 3 13:52:10 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 16:16:39 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=26953d8f
sys-process/psmisc: remove duplicated patch
the same patch is applied twice, no idea how this went undetected for so long
Closes:https://github.com/gentoo/musl/pull/363
Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
.../psmisc/files/psmisc-23.1-musl_ptregs.patch | 45 ----------------------
sys-process/psmisc/psmisc-23.1-r1.ebuild | 1 -
2 files changed, 46 deletions(-)
diff --git a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch b/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
deleted file mode 100644
index 1b474bc..0000000
--- a/sys-process/psmisc/files/psmisc-23.1-musl_ptregs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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 ad05102..0b0046d 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -23,7 +23,6 @@ DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=(
"${FILESDIR}"/${P}-include_limits.patch
- "${FILESDIR}"/${P}-musl_ptregs.patch
)
src_configure() {