From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/tio: fix termio redefinition
Date: Sun, 29 Dec 2019 21:43:36 +0100 [thread overview]
Message-ID: <20191229204336.GC26395@scaer> (raw)
In-Reply-To: <20191227204520.1500501-1-fontaine.fabrice@gmail.com>
Fabrice, All,
On 2019-12-27 21:45 +0100, Fabrice Fontaine spake thusly:
> Fixes:
> - http://autobuild.buildroot.org/results/1a7418b9cd11374a250f7509d5bddcc864375e1c
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Thanks for this patch, but I am on the same page as Thomas, so I've
marked this patch as Changes Requested on patchwork.
Regards,
Yann E. MORIN.
> ---
> ...tspeed2.c-fix-redefinition-of-termio.patch | 45 +++++++++++++++++++
> 1 file changed, 45 insertions(+)
> create mode 100644 package/tio/0001-src-setspeed2.c-fix-redefinition-of-termio.patch
>
> diff --git a/package/tio/0001-src-setspeed2.c-fix-redefinition-of-termio.patch b/package/tio/0001-src-setspeed2.c-fix-redefinition-of-termio.patch
> new file mode 100644
> index 0000000000..de47290a0d
> --- /dev/null
> +++ b/package/tio/0001-src-setspeed2.c-fix-redefinition-of-termio.patch
> @@ -0,0 +1,45 @@
> +From 7a84120f7bfbe698fa8050953b7a3e7a7dc63ca0 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Fri, 27 Dec 2019 17:41:14 +0100
> +Subject: [PATCH] src/setspeed2.c: fix redefinition of termio
> +
> +Include ioctls.h and termbits.h from asm-generic instead of asm to avoid
> +the following build failure:
> +
> +In file included from setspeed2.c:24:0:
> +/home/naourr/work/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/asm/termbits.h:17:8: error: redefinition of 'struct termio'
> + struct termio {
> + ^~~~~~
> +In file included from /home/naourr/work/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/sys/ioctl.h:29:0,
> + from setspeed2.c:22:
> +/home/naourr/work/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/bits/ioctl-types.h:36:8: note: originally defined here
> + struct termio
> + ^~~~~~
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/1a7418b9cd11374a250f7509d5bddcc864375e1c
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/tio/tio/pull/98]
> +---
> + src/setspeed2.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/src/setspeed2.c b/src/setspeed2.c
> +index 0adf695..6d82e66 100644
> +--- a/src/setspeed2.c
> ++++ b/src/setspeed2.c
> +@@ -20,8 +20,8 @@
> + */
> +
> + #include <sys/ioctl.h>
> +-#include <asm/ioctls.h>
> +-#include <asm/termbits.h>
> ++#include <asm-generic/ioctls.h>
> ++#include <asm-generic/termbits.h>
> +
> + int setspeed2(int fd, int baudrate)
> + {
> +--
> +2.24.0
> +
> --
> 2.24.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2019-12-29 20:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-27 20:45 [Buildroot] [PATCH 1/1] package/tio: fix termio redefinition Fabrice Fontaine
2019-12-29 13:51 ` Thomas Petazzoni
2019-12-29 20:43 ` Yann E. MORIN [this message]
2019-12-29 22:17 ` Fabrice Fontaine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191229204336.GC26395@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox