From 61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 29 Apr 2014 16:58:45 +0200 Subject: main/qemu: replace patches with the ones sent upstream Patches sent upstream: http://lists.nongnu.org/archive/html/qemu-devel/2014-04/msg04773.html --- ...penpty-fix-build-with-musl-libc-by-includ.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 main/qemu/0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch (limited to 'main/qemu/0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch') diff --git a/main/qemu/0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch b/main/qemu/0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch new file mode 100644 index 0000000000..a11df7a835 --- /dev/null +++ b/main/qemu/0002-util-qemu-openpty-fix-build-with-musl-libc-by-includ.patch @@ -0,0 +1,42 @@ +From 48fbea622a77f38a0fb33e862486d4c70eb8cf66 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 29 Apr 2014 10:14:57 +0200 +Subject: [PATCH 2/6] util/qemu-openpty: fix build with musl libc by include + termios.h as fallback + +Include termios.h as POSIX fallback when not glibc, bsd or solaris. +POSIX says that termios.h should define struct termios and TCAFLUSH. +http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/termios.h.html + +This fixes the following compile errors with musl libc: + +util/qemu-openpty.c: In function 'qemu_openpty_raw': +util/qemu-openpty.c:112:20: error: storage size of 'tty' isn't known + struct termios tty; + ^ +... +util/qemu-openpty.c:128:24: error: 'TCSAFLUSH' undeclared (first use in this function) + tcsetattr(*aslave, TCSAFLUSH, &tty); + ^ + +Signed-off-by: Natanael Copa +--- + util/qemu-openpty.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/util/qemu-openpty.c b/util/qemu-openpty.c +index 4febfe9..4c53211 100644 +--- a/util/qemu-openpty.c ++++ b/util/qemu-openpty.c +@@ -47,6 +47,8 @@ + #elif defined CONFIG_SOLARIS + # include + # include ++#else ++# include + #endif + + #ifdef __sun__ +-- +1.9.2 + -- cgit v1.2.3