mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-07 14:28:50 +00:00
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
|
From 82a6da13c3a113eefdb378ff53635f32a6184d6f Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
||
|
|
Date: Thu, 8 Sep 2022 16:59:36 +0200
|
||
|
|
Subject: [PATCH] tools: termios_linux.h: Fix compilation on non-glibc systems
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
TCGETS2 is defined in header file asm/ioctls.h provided by linux kernel.
|
||
|
|
On glib systems it is automatically included by some other glibc include
|
||
|
|
header file and therefore TCGETS2 is present in termios_linux.h when
|
||
|
|
linux kernel provides it.
|
||
|
|
|
||
|
|
On non-glibc systems (e.g. musl) asm/ioctls.h is not automatically included
|
||
|
|
which results in the strange error that BOTHER is supported, TCGETS2 not
|
||
|
|
defined and struct termios does not provide c_ispeed member.
|
||
|
|
|
||
|
|
tools/kwboot.c: In function 'kwboot_tty_change_baudrate':
|
||
|
|
tools/kwboot.c:662:6: error: 'struct termios' has no member named 'c_ospeed'
|
||
|
|
662 | tio.c_ospeed = tio.c_ispeed = baudrate;
|
||
|
|
| ^
|
||
|
|
|
||
|
|
Fix this issue by explicitly including asm/ioctls.h file which provides
|
||
|
|
TCGETS2 macro (if supported on selected architecture) to not depending on
|
||
|
|
glibc auto-include behavior and because termios_linux.h requires it.
|
||
|
|
|
||
|
|
With this change it is possible compile kwboot with musl libc.
|
||
|
|
|
||
|
|
Reported-by: Michal Vasilek <michal.vasilek@nic.cz>
|
||
|
|
Signed-off-by: Pali Rohár <pali@kernel.org>
|
||
|
|
---
|
||
|
|
tools/termios_linux.h | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
--- a/tools/termios_linux.h
|
||
|
|
+++ b/tools/termios_linux.h
|
||
|
|
@@ -29,6 +29,7 @@
|
||
|
|
#include <errno.h>
|
||
|
|
#include <sys/ioctl.h>
|
||
|
|
#include <sys/types.h>
|
||
|
|
+#include <asm/ioctls.h>
|
||
|
|
#include <asm/termbits.h>
|
||
|
|
|
||
|
|
#if defined(BOTHER) && defined(TCGETS2)
|