From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baruch Siach Date: Thu, 12 Apr 2018 19:28:24 +0300 Subject: [Buildroot] [PATCH v2] picocom: fix build for x86 with musl libc Message-ID: <1924119c66e46d2075ae4b626ce34808e3f3e926.1523550504.git.baruch@tkos.co.il> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Since version 3.1 picocom enabled by default custom baud rate support for x86 targets. This requires the c_ispeed and c_opseed field in struct termios that musl libc does not provide. Add an upstream patch that restricts custom baud rates to C libraries that provide the needed termios fields. Fixes: http://autobuild.buildroot.net/results/28e/28ec584484dedfd6ef473dfd9dd24481e27ce2b3/ http://autobuild.buildroot.net/results/912/912493a8f99416524a5897634ae62604436e9b51/ http://autobuild.buildroot.net/results/65d/65d0f449822f296dfe6b9be0e03a5a855f700a9e/ Cc: Matt Weber Signed-off-by: Baruch Siach --- v2: Use upstream patch instead of local build time disable --- ...mpile-with-libc-s-without-cispeed-cospeed.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch diff --git a/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch b/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch new file mode 100644 index 000000000000..d634a5e2179d --- /dev/null +++ b/package/picocom/0001-Compile-with-libc-s-without-cispeed-cospeed.patch @@ -0,0 +1,49 @@ +From 30c712c5f14306460c44bea70e24419db9d44f8c Mon Sep 17 00:00:00 2001 +From: Nick Patavalis +Date: Thu, 12 Apr 2018 15:16:04 +0300 +Subject: [PATCH] Compile with libc's without cispeed / cospeed + +Some libc implementations (e.g. musl) do not define the cispeed and +cospeed struct termios fields. So we have to check the +_HAVE_STRUCT_TERMIOS_C_ISPEED and _HAVE_STRUCT_TERMIOS_C_OSPEED +macros. If not defined, we disable custom baudrate support. + +[baruch: backported from upstream master to 3.1] +Signed-off-by: Baruch Siach +--- +Upstream status: commit 30c712c5f143 + + custbaud.h | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/custbaud.h b/custbaud.h +index 48151a4a4e84..ae4ae8daf49e 100644 +--- a/custbaud.h ++++ b/custbaud.h +@@ -26,6 +26,8 @@ + #ifndef CUSTBAUD_H + #define CUSTBAUD_H + ++#include ++ + #ifndef NO_CUSTOM_BAUD + + #if defined (__linux__) +@@ -33,7 +35,13 @@ + /* Enable by-default for kernels > 2.6.0 on x86 and x86_64 only */ + #include + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) +-#if defined (__i386__) || defined (__x86_64__) || defined (USE_CUSTOM_BAUD) ++/* Some libc implementations (e.g. musl) do not define the cispeed and ++ cospeed struct termios fields. We do not support custom baudrates ++ on them. */ ++#if ( (defined (__i386__) || defined (__x86_64__)) \ ++ && defined (_HAVE_STRUCT_TERMIOS_C_ISPEED) \ ++ && defined (_HAVE_STRUCT_TERMIOS_C_OSPEED) ) \ ++ || defined (USE_CUSTOM_BAUD) + #ifndef USE_CUSTOM_BAUD + #define USE_CUSTOM_BAUD + #endif +-- +2.16.3 + -- 2.16.3