Browse Source

picocom: fix compilation with musl (#1383)

Only use termio.h with glibc or uclibc, for musl include sys/ioctl.h and
termios.h instead.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
lilik-openwrt-22.03
Jo-Philipp Wich 10 years ago
parent
commit
acfce97879
2 changed files with 19 additions and 2 deletions
  1. +2
    -2
      utils/picocom/Makefile
  2. +17
    -0
      utils/picocom/patches/100-musl-compat.patch

+ 2
- 2
utils/picocom/Makefile View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2014 OpenWrt.org
# Copyright (C) 2006-2015 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=picocom PKG_NAME:=picocom
PKG_VERSION:=1.7 PKG_VERSION:=1.7
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://picocom.googlecode.com/files PKG_SOURCE_URL:=http://picocom.googlecode.com/files


+ 17
- 0
utils/picocom/patches/100-musl-compat.patch View File

@ -0,0 +1,17 @@
Index: picocom-1.7/term.c
===================================================================
--- picocom-1.7.orig/term.c
+++ picocom-1.7/term.c
@@ -33,10 +33,11 @@
#include <string.h>
#include <errno.h>
#include <unistd.h>
-#ifdef __linux__
+#if defined(__linux__) && (defined(__GLIBC__) || defined(__UCLIBC__))
#include <termio.h>
#else
#include <termios.h>
+#include <sys/ioctl.h>
#endif /* of __linux__ */
#include "term.h"

Loading…
Cancel
Save