Skip to contentSkip to conversation

package/util-linux: fix build with glibc 2.29

PATCH New Fabrice Fontaine 2 participants 2 messages Apr 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/util-linux: fix build with glibc 2.29

Fixes:
- No autobuilders failures yet (found with
qemu_mips64el_malta_defconfig)

---
 ...alue-of_HAVE_STRUCT_TERMIOS_C_ISPEED.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/util-linux/0004-ldattach-Check-for-value-of_HAVE_STRUCT_TERMIOS_C_ISPEED.patch
package/util-linux/0004-ldattach-Check-for-value-of_HAVE_STRUCT_TERMIOS_C_ISPEED.patch new file +32 -0
new file mode 100644
index 0000000000..381c25382a
@@ -0,0 +1,32 @@
+From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+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 <[email protected]>
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Retrieved from:
+https://github.com/karelzak/util-linux/commit/963413a1adf6767ab17712097e288e1a346f63a7]
+---
+ 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;
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/util-linux: fix build with glibc 2.29

Hello,

Quoted 3 lines · On Sun, 14 Apr 2019 12:58:33 +0200 Fabrice Fontaine…

Fixes:
- No autobuilders failures yet (found with
qemu_mips64el_malta_defconfig)

I guess the issue only pops up on MIPS64 perhaps ? Because we do have an autobuilder configuration testing ARM internal toolchain with glibc, so it should have been detected by the autobuilders already if it was not an architecture specific issue.

Quoted 5 lines
---
 ...alue-of_HAVE_STRUCT_TERMIOS_C_ISPEED.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/util-linux/0004-ldattach-Check-for-value-of_HAVE_STRUCT_TERMIOS_C_ISPEED.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com