From f2646ea56e5ce82561089956c4a1f0d3c81087b1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Jan 2019 22:47:10 -0800 Subject: util-linux: Fix build with glibc 2.29 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- .../check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch | 16 ++++++++++++++++ meta/recipes-core/util-linux/util-linux_2.32.1.bb | 1 + 2 files changed, 17 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch diff --git a/meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch b/meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch new file mode 100644 index 0000000000..c92c276ac1 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch @@ -0,0 +1,16 @@ +Checking for exitence of the define is not enough since +it will be defined with 0 or 1 value + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/sys-utils/ldattach.c ++++ b/sys-utils/ldattach.c +@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios + * -- we have to bypass glibc and set the speed manually (because glibc + * checks for speed and supports Bxxx bit rates only)... + */ +-#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED ++#if _HAVE_STRUCT_TERMIOS_C_ISPEED + # define BOTHER 0010000 /* non standard rate */ + dbg("using non-standard speeds"); + ts->c_ospeed = ts->c_ispeed = speed; diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb index a616d85bb2..c909836cbb 100644 --- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb @@ -14,6 +14,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ + file://check-for-_HAVE_STRUCT_TERMIOS_C_OSPEED.patch \ " SRC_URI[md5sum] = "9e5b1b8c1dc99455bdb6b462cf9436d9" SRC_URI[sha256sum] = "86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2" -- cgit 1.2.3-korg