summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-13 19:36:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:31 +0000
commit368e838f7764b6842b56555a88713fdd9596f809 (patch)
tree98562845f379035f04f87e5f3ccb5ffb4e6e8268
parent5a8c935f2a63aec22e18bd18b05b7a9bf8b8187f (diff)
downloadpoky-368e838f7764b6842b56555a88713fdd9596f809.tar.gz
console-tools: Fix header inclusion when not using glibc
It did differentiate on features in libc but assumed always glibc this patch make that assumption clear (From OE-Core rev: c360290f22abfe9e37ca2fc0766b5a08a3276f6b) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch51
-rw-r--r--meta/recipes-core/console-tools/console-tools_0.3.2.bb3
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
new file mode 100644
index 0000000000..ace4bf0a76
--- /dev/null
+++ b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
@@ -0,0 +1,51 @@
1From b6a59b05f1fa514c6b387c9544bd63b1bfcf2eed Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 05:38:29 +0000
4Subject: [PATCH] Cover the else with __GLIBC__
5
6Fixes build errors on musl/x86
7
8| In file included from
9/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm/termios.h:1:0,
10| from
11/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/linux/termios.h:5,
12| from
13/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:86:
14|
15/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm-generic/termios.h:14:8:
16error: redefinition of 'struct winsize'
17| struct winsize {
18| ^
19| In file included from
20/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/sys/ioctl.h:7:0,
21| from
22/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:81:
23|
24/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/bits/ioctl.h:90:8:
25note: originally defined here
26| struct winsize {
27| ^
28
29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30---
31Upstream-Status: Pending
32
33 vttools/resizecons.c | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-)
35
36diff --git a/vttools/resizecons.c b/vttools/resizecons.c
37index f0a7055..e8753b1 100644
38--- a/vttools/resizecons.c
39+++ b/vttools/resizecons.c
40@@ -81,7 +81,7 @@
41 #include <sys/ioctl.h>
42 #if (__GNU_LIBRARY__ >= 6)
43 # include <sys/perm.h>
44-#else
45+#elif defined __GLIBC__
46 # include <linux/types.h>
47 # include <linux/termios.h>
48 #endif
49--
502.7.0
51
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index d14d683d1b..1db8414cb2 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
15 file://fix-libconsole-linking.patch \ 15 file://fix-libconsole-linking.patch \
16 file://no-dep-on-libfl.patch \ 16 file://no-dep-on-libfl.patch \
17 file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \ 17 file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \
18 file://0001-Cover-the-else-with-__GLIBC__.patch \
18 file://lcmessage.m4 \ 19 file://lcmessage.m4 \
19 file://Makevars" 20 file://Makevars"
20 21
@@ -24,6 +25,8 @@ SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1
24UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/" 25UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/"
25UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/" 26UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/"
26 27
28CFLAGS_append_aarch64 = " -D_USE_TERMIOS "
29
27do_configure_prepend () { 30do_configure_prepend () {
28 mkdir -p ${S}/m4 31 mkdir -p ${S}/m4
29 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/ 32 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/