gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-apps/util-linux: Build fix on MIPS from upstream

Browse Source 
In glibc-2.29, the definitions of 'struct termios' were consolidated
across architectures.  This causes a build error in util-linux on MIPS
due to undefined struct members 'c_ospeed' and 'c_ispeed', which MIPS
does not have.  The included patch from upstream fixes this, and should
be in the next util-linux release.

Signed-off-by: Joshua Kinard <kumba@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12
This commit is contained in:
Joshua Kinard
2019-03-24 15:43:33 -04:00
parent 65d1ad1b75
commit 14577373ea
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch Normal file
View File

@@ -0,0 +1,30 @@
From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 4 Jan 2019 22:38:25 -0800
Subject: [PATCH] ldattach: Check for value of _HAVE_STRUCT_TERMIOS_C_ISPEED
in glibc 2.29+ checking for just existence of _HAVE_STRUCT_TERMIOS_C_ISPEED
won't be enough, the value has to be checked
see
https://sourceware.org/git/?p=glibc.git;a=commit;h=e5a50db36eaa6e8c6427b3a971563240b633ca85
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
sys-utils/ldattach.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
index d33d68535..fb50711eb 100644
--- a/sys-utils/ldattach.c
+++ b/sys-utils/ldattach.c
@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
* -- we have to bypass glibc and set the speed manually (because glibc
* checks for speed and supports Bxxx bit rates only)...
*/
-#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
+#if _HAVE_STRUCT_TERMIOS_C_ISPEED
# define BOTHER 0010000 /* non standard rate */
dbg("using non-standard speeds");
ts->c_ospeed = ts->c_ispeed = speed;

7
sys-apps/util-linux/util-linux-2.33.1.ebuild
View File

@@ -90,6 +90,13 @@ src_prepare() {
configure || die
elibtoolize
# In glibc-2.29+, a lot of changes were made to arch-specific
# handling of `struct termios', which breaks atleast MIPS.
# The below patch from upstream fixes this, and should be
# in the next release.
# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
epatch "${FILESDIR}/${P}-fix-struct_termios-check.patch"
}
lfs_fallocate_test() {