From: "Sven Wegener" <swegener@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
Date: Thu, 4 Jan 2018 23:18:54 +0000 (UTC) [thread overview]
Message-ID: <1515107920.2aacf8d5e4052441f9bb791051a30146bf65793e.swegener@gentoo> (raw)
commit: 2aacf8d5e4052441f9bb791051a30146bf65793e
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 23:15:15 2018 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 23:18:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aacf8d5
app-misc/screen: Fix building on musl libc, bug #639424
Closes: https://bugs.gentoo.org/639424
Package-Manager: Portage-2.3.14, Repoman-2.3.6
app-misc/screen/files/screen-4.4.0-utmp-musl.patch | 62 ++++++++++++++++++++++
app-misc/screen/screen-4.4.0.ebuild | 3 +-
2 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
new file mode 100644
index 00000000000..990c73042cd
--- /dev/null
+++ b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
@@ -0,0 +1,62 @@
+From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
+Date: Sat, 13 Jun 2015 17:52:46 +0200
+Subject: [PATCH] change checks for utmp/utmpx in header
+
+linuxes should've working utmpx, so this check was bit weird
+commit 2b1bdf96 mentions some "linux workaround", but nothing specific
+
+fixes build with musl libc
+---
+ os.h | 7 ++++---
+ utmp.c | 4 ++--
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/os.h b/os.h
+index 55de249..e827ac9 100644
+--- a/os.h
++++ b/os.h
+@@ -250,9 +250,11 @@ extern int errno;
+ #endif
+
+ #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
+-# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
++# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
+ # include <utmpx.h>
+-# define UTMPFILE UTMPX_FILE
++# ifdef UTMPX_FILE /* GNU extension */
++# define UTMPFILE UTMPX_FILE
++# endif
+ # define utmp utmpx
+ # define getutent getutxent
+ # define getutid getutxid
+@@ -260,7 +262,6 @@ extern int errno;
+ # define pututline pututxline
+ # define setutent setutxent
+ # define endutent endutxent
+-# define ut_time ut_xtime
+ # else /* SVR4 */
+ # include <utmp.h>
+ # endif /* SVR4 */
+diff --git a/utmp.c b/utmp.c
+index fa8b87b..f5d7db8 100644
+--- a/utmp.c
++++ b/utmp.c
+@@ -631,7 +631,7 @@ int pid;
+ /* must use temp variable because of NetBSD/sparc64, where
+ * ut_xtime is long(64) but time_t is int(32) */
+ (void)time(&now);
+- u->ut_time = now;
++ u->ut_tv.tv_sec = now;
+ }
+
+ static slot_t
+@@ -743,7 +743,7 @@ int pid;
+ strncpy(u->ut_line, line, sizeof(u->ut_line));
+ strncpy(u->ut_name, user, sizeof(u->ut_name));
+ (void)time(&now);
+- u->ut_time = now;
++ u->ut_tv.tv_sec = now;
+ }
+
+ static slot_t
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
index 0ee4276016c..0dfbfbc066c 100644
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,6 +26,7 @@ DEPEND="${CDEPEND}
# - Don't use utempter even if it is found on the system.
PATCHES=(
"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ "${FILESDIR}"/${P}-utmp-musl.patch
)
pkg_setup() {
next reply other threads:[~2018-01-04 23:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-04 23:18 Sven Wegener [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-16 6:49 [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/ Sam James
2023-04-10 19:57 Sven Wegener
2022-12-21 22:47 Sam James
2022-09-10 1:57 Sam James
2022-02-19 6:31 Sven Wegener
2021-02-24 19:25 Sven Wegener
2020-02-27 8:59 Lars Wendler
2018-01-04 23:18 Sven Wegener
2017-03-13 13:03 Lars Wendler
2016-01-29 12:37 Jeroen Roovers
2016-01-23 12:44 Jeroen Roovers
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=1515107920.2aacf8d5e4052441f9bb791051a30146bf65793e.swegener@gentoo \
--to=swegener@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