From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 624F6158014 for ; Mon, 30 Aug 2021 02:35:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CDE4E0867; Mon, 30 Aug 2021 02:35:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7ECB5E0867 for ; Mon, 30 Aug 2021 02:35:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8EE1D335D3C for ; Mon, 30 Aug 2021 02:35:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DC9C07E for ; Mon, 30 Aug 2021 02:35:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1630290864.87f87c28f18c7cdd396f4e2e68dfaee778506eb8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/procps/, sys-process/procps/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/procps/files/procps-3.3.17-musl-fix.patch sys-process/procps/procps-3.3.17-r1.ebuild X-VCS-Directories: sys-process/procps/ sys-process/procps/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 87f87c28f18c7cdd396f4e2e68dfaee778506eb8 X-VCS-Branch: master Date: Mon, 30 Aug 2021 02:35:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e805d36-aef5-41a6-a67f-8aadcd6305c8 X-Archives-Hash: 0f2dea71a65b12be48c8bf0311768750 commit: 87f87c28f18c7cdd396f4e2e68dfaee778506eb8 Author: Sam James gentoo org> AuthorDate: Mon Aug 30 02:34:24 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 30 02:34:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f87c28 sys-process/procps: add stop-gap musl patch for now Conditionally apply a patch from ::musl for building on musl (to facilitate stage building). A different (better) approach was taken upstream and will result in a --disable-w configure option in the next release, but we're not there yet. Closes: https://bugs.gentoo.org/794997 Signed-off-by: Sam James gentoo.org> .../procps/files/procps-3.3.17-musl-fix.patch | 78 ++++++++++++++++++++++ sys-process/procps/procps-3.3.17-r1.ebuild | 8 +++ 2 files changed, 86 insertions(+) diff --git a/sys-process/procps/files/procps-3.3.17-musl-fix.patch b/sys-process/procps/files/procps-3.3.17-musl-fix.patch new file mode 100644 index 00000000000..4402354c21e --- /dev/null +++ b/sys-process/procps/files/procps-3.3.17-musl-fix.patch @@ -0,0 +1,78 @@ +Temporary stopgap patch (a different solution was used upstream +in the next release, should be in the next after 3.3.17 -- we'll need to +add --disable-w instead). + +https://bugs.gentoo.org/794997 + +From 7bfe2b7c12b33aabca71491360c433d2d3f7bbf4 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 24 Feb 2021 21:14:31 +0000 +Subject: [PATCH 1/2] w.c: correct musl builds + +No need to redefine UT_ stuff to something that does not exist. + +UT_ is already provided in musl but via utmp.h header, so include +it always. + +Signed-off-by: Alexander Kanavin +--- + w.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/w.c b/w.c +index 9d07ac9e..d10639b8 100644 +--- a/w.c ++++ b/w.c +@@ -57,9 +57,8 @@ + #include + #ifdef HAVE_UTMPX_H + # include +-#else +-# include + #endif ++#include + #include + + static int ignoreuser = 0; /* for '-u' */ +@@ -72,12 +71,6 @@ typedef struct utmpx utmp_t; + typedef struct utmp utmp_t; + #endif + +-#if !defined(UT_HOSTSIZE) || defined(__UT_HOSTSIZE) +-# define UT_HOSTSIZE __UT_HOSTSIZE +-# define UT_LINESIZE __UT_LINESIZE +-# define UT_NAMESIZE __UT_NAMESIZE +-#endif +- + #ifdef W_SHOWFROM + # define FROM_STRING "on" + #else +-- +GitLab + + +From 145165aba6c659f3f0f3567a323a3e6170408ea6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 24 Feb 2021 21:16:14 +0000 +Subject: [PATCH 2/2] proc/escape.c: add missing include + +Signed-off-by: Alexander Kanavin +--- + proc/escape.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/proc/escape.c b/proc/escape.c +index 2e8fb7dd..e1f4612d 100644 +--- a/proc/escape.c ++++ b/proc/escape.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include "procps.h" + #include "escape.h" + #include "readproc.h" +-- +GitLab + diff --git a/sys-process/procps/procps-3.3.17-r1.ebuild b/sys-process/procps/procps-3.3.17-r1.ebuild index 77bbf988516..2fa54d22f40 100644 --- a/sys-process/procps/procps-3.3.17-r1.ebuild +++ b/sys-process/procps/procps-3.3.17-r1.ebuild @@ -42,6 +42,14 @@ PATCHES=( "${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036 ) +src_prepare() { + default + + # Please drop this after 3.3.17 and instead use --disable-w on musl. + # bug #794997 + use elibc_musl && eapply "${FILESDIR}"/${PN}-3.3.17-musl-fix.patch +} + multilib_src_configure() { # http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support append-lfs-flags #471102