diff options
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-core/console-tools/console-tools_0.3.2.bb | 3 |
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 @@ +From b6a59b05f1fa514c6b387c9544bd63b1bfcf2eed Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jan 2016 05:38:29 +0000 +Subject: [PATCH] Cover the else with __GLIBC__ + +Fixes build errors on musl/x86 + +| In file included from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm/termios.h:1:0, +| from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/linux/termios.h:5, +| from +/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: +| +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm-generic/termios.h:14:8: +error: redefinition of 'struct winsize' +| struct winsize { +| ^ +| In file included from +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/sys/ioctl.h:7:0, +| from +/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: +| +/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/bits/ioctl.h:90:8: +note: originally defined here +| struct winsize { +| ^ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + vttools/resizecons.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vttools/resizecons.c b/vttools/resizecons.c +index f0a7055..e8753b1 100644 +--- a/vttools/resizecons.c ++++ b/vttools/resizecons.c +@@ -81,7 +81,7 @@ + #include <sys/ioctl.h> + #if (__GNU_LIBRARY__ >= 6) + # include <sys/perm.h> +-#else ++#elif defined __GLIBC__ + # include <linux/types.h> + # include <linux/termios.h> + #endif +-- +2.7.0 + 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 \ file://fix-libconsole-linking.patch \ file://no-dep-on-libfl.patch \ file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \ + file://0001-Cover-the-else-with-__GLIBC__.patch \ file://lcmessage.m4 \ file://Makevars" @@ -24,6 +25,8 @@ SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/" UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/" +CFLAGS_append_aarch64 = " -D_USE_TERMIOS " + do_configure_prepend () { mkdir -p ${S}/m4 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/ |