commit: 87f87c28f18c7cdd396f4e2e68dfaee778506eb8 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Aug 30 02:34:24 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <[email protected]> +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 <[email protected]> +--- + 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 <unistd.h> + #ifdef HAVE_UTMPX_H + # include <utmpx.h> +-#else +-# include <utmp.h> + #endif ++#include <utmp.h> + #include <arpa/inet.h> + + 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 <[email protected]> +Date: Wed, 24 Feb 2021 21:16:14 +0000 +Subject: [PATCH 2/2] proc/escape.c: add missing include + +Signed-off-by: Alexander Kanavin <[email protected]> +--- + 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 <sys/types.h> + #include <string.h> + #include <limits.h> ++#include <langinfo.h> + #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
