[OE-core] [sumo][PATCH] coreutils: 8.29: fix native build
Stefan Müller-Klieser
s.mueller-klieser at phytec.de
Fri Mar 29 08:44:21 UTC 2019
Hi Armin,
On 19.03.19 16:13, akuster808 wrote:
> On 3/14/19 8:43 AM, Stefan Müller-Klieser wrote:
>> This fixes the native build on glibc 2.28 hosts, by backporting two
>> gnulib patches from master.
> This will need to be done for Thud too.
> - armin
coreutils 8.30 in thud already carries those patches.
Stefan
>>
>> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser at phytec.de>
>> ---
>> ...adjust-to-glibc-2.28-libio.h-removal.patch | 193 ++++++++++++++++++
>> ...e-more-paranoid-about-libio.h-change.patch | 187 +++++++++++++++++
>> meta/recipes-core/coreutils/coreutils_8.29.bb | 2 +
>> 3 files changed, 382 insertions(+)
>> create mode 100644 meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
>> create mode 100644 meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch
>>
>> diff --git a/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
>> new file mode 100644
>> index 000000000000..110b34372db1
>> --- /dev/null
>> +++ b/meta/recipes-core/coreutils/coreutils/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
>> @@ -0,0 +1,193 @@
>> +From 269a8987224ec62b7a9aa6202772b07d5be424d2 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser at phytec.de>
>> +Date: Mon, 11 Mar 2019 16:00:33 +0100
>> +Subject: [PATCH 1/2] fflush: adjust to glibc 2.28 libio.h removal
>> +MIME-Version: 1.0
>> +Content-Type: text/plain; charset=UTF-8
>> +Content-Transfer-Encoding: 8bit
>> +
>> +Backport of patch:
>> +4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
>> +Paul Eggert <eggert at cs.ucla.edu>
>> +fflush: adjust to glibc 2.28 libio.h removal
>> +
>> +Upstream-Status: Backport [master]
>> +
>> +Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser at phytec.de>
>> +---
>> + lib/fflush.c | 6 +++---
>> + lib/fpending.c | 2 +-
>> + lib/fpurge.c | 2 +-
>> + lib/freadahead.c | 2 +-
>> + lib/freading.c | 2 +-
>> + lib/freadptr.c | 2 +-
>> + lib/freadseek.c | 2 +-
>> + lib/fseeko.c | 4 ++--
>> + lib/fseterr.c | 2 +-
>> + lib/stdio-impl.h | 6 ++++++
>> + 10 files changed, 18 insertions(+), 12 deletions(-)
>> +
>> +diff --git a/lib/fflush.c b/lib/fflush.c
>> +index 4e65692644b1..c16da5fdcf23 100644
>> +--- a/lib/fflush.c
>> ++++ b/lib/fflush.c
>> +@@ -33,7 +33,7 @@
>> + #undef fflush
>> +
>> +
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> +
>> + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
>> + static void
>> +@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
>> +
>> + #endif
>> +
>> +-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
>> ++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
>> +
>> + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
>> + if (stream == NULL || ! freading (stream))
>> + return fflush (stream);
>> +
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> +
>> + clear_ungetc_buffer_preserving_position (stream);
>> +
>> +diff --git a/lib/fpending.c b/lib/fpending.c
>> +index 5811a4a74750..9e21a165e220 100644
>> +--- a/lib/fpending.c
>> ++++ b/lib/fpending.c
>> +@@ -32,7 +32,7 @@ __fpending (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + return fp->_IO_write_ptr - fp->_IO_write_base;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +diff --git a/lib/fpurge.c b/lib/fpurge.c
>> +index 408b8fcbb3b8..3a160004d49d 100644
>> +--- a/lib/fpurge.c
>> ++++ b/lib/fpurge.c
>> +@@ -62,7 +62,7 @@ fpurge (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_IO_read_end = fp->_IO_read_ptr;
>> + fp->_IO_write_ptr = fp->_IO_write_base;
>> + /* Avoid memory leak when there is an active ungetc buffer. */
>> +diff --git a/lib/freadahead.c b/lib/freadahead.c
>> +index f335f041ee5e..e7cb77b6722b 100644
>> +--- a/lib/freadahead.c
>> ++++ b/lib/freadahead.c
>> +@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
>> + size_t
>> + freadahead (FILE *fp)
>> + {
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + if (fp->_IO_write_ptr > fp->_IO_write_base)
>> + return 0;
>> + return (fp->_IO_read_end - fp->_IO_read_ptr)
>> +diff --git a/lib/freading.c b/lib/freading.c
>> +index 78140d27bfef..c9d33449e948 100644
>> +--- a/lib/freading.c
>> ++++ b/lib/freading.c
>> +@@ -31,7 +31,7 @@ freading (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + return ((fp->_flags & _IO_NO_WRITES) != 0
>> + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
>> + && fp->_IO_read_base != NULL));
>> +diff --git a/lib/freadptr.c b/lib/freadptr.c
>> +index e4cc0b02fba2..aba8dd5964fc 100644
>> +--- a/lib/freadptr.c
>> ++++ b/lib/freadptr.c
>> +@@ -29,7 +29,7 @@ freadptr (FILE *fp, size_t *sizep)
>> + size_t size;
>> +
>> + /* Keep this code in sync with freadahead! */
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + if (fp->_IO_write_ptr > fp->_IO_write_base)
>> + return NULL;
>> + size = fp->_IO_read_end - fp->_IO_read_ptr;
>> +diff --git a/lib/freadseek.c b/lib/freadseek.c
>> +index fcecba6829c5..98726f845f88 100644
>> +--- a/lib/freadseek.c
>> ++++ b/lib/freadseek.c
>> +@@ -36,7 +36,7 @@ freadptrinc (FILE *fp, size_t increment)
>> + /* Keep this code in sync with freadptr! */
>> + #if HAVE___FREADPTRINC /* musl libc */
>> + __freadptrinc (fp, increment);
>> +-#elif defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#elif defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_IO_read_ptr += increment;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +diff --git a/lib/fseeko.c b/lib/fseeko.c
>> +index d0f24d8a838f..0ae2b153cff5 100644
>> +--- a/lib/fseeko.c
>> ++++ b/lib/fseeko.c
>> +@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
>> + #endif
>> +
>> + /* These tests are based on fpurge.c. */
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + if (fp->_IO_read_end == fp->_IO_read_ptr
>> + && fp->_IO_write_ptr == fp->_IO_write_base
>> + && fp->_IO_save_base == NULL)
>> +@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
>> + return -1;
>> + }
>> +
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_flags &= ~_IO_EOF_SEEN;
>> + fp->_offset = pos;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> +diff --git a/lib/fseterr.c b/lib/fseterr.c
>> +index 739e5453d04e..d998619771f3 100644
>> +--- a/lib/fseterr.c
>> ++++ b/lib/fseterr.c
>> +@@ -29,7 +29,7 @@ fseterr (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_flags |= _IO_ERR_SEEN;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
>> +index 329801ad23b0..eeaabab66b2f 100644
>> +--- a/lib/stdio-impl.h
>> ++++ b/lib/stdio-impl.h
>> +@@ -18,6 +18,12 @@
>> + the same implementation of stdio extension API, except that some fields
>> + have different naming conventions, or their access requires some casts. */
>> +
>> ++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
>> ++ problem by defining it ourselves. FIXME: Do not rely on glibc
>> ++ internals. */
>> ++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
>> ++# define _IO_IN_BACKUP 0x100
>> ++#endif
>> +
>> + /* BSD stdio derived implementations. */
>> +
>> +--
>> +2.20.1
>> +
>> diff --git a/meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch
>> new file mode 100644
>> index 000000000000..8cc7d6377947
>> --- /dev/null
>> +++ b/meta/recipes-core/coreutils/coreutils/0002-fflush-be-more-paranoid-about-libio.h-change.patch
>> @@ -0,0 +1,187 @@
>> +From 72a2dae68c9101d80abdce8c4e41f7e562bd2399 Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser at phytec.de>
>> +Date: Wed, 13 Mar 2019 14:09:39 +0100
>> +Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
>> +MIME-Version: 1.0
>> +Content-Type: text/plain; charset=UTF-8
>> +Content-Transfer-Encoding: 8bit
>> +
>> +Backport of patch:
>> +74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
>> +Paul Eggert <eggert at cs.ucla.edu>
>> +fflush: be more paranoid about libio.h change
>> +
>> +Upstream-Status: Backport [master]
>> +
>> +Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser at phytec.de>
>> +---
>> + lib/fflush.c | 9 ++++++---
>> + lib/fpending.c | 3 ++-
>> + lib/fpurge.c | 3 ++-
>> + lib/freadahead.c | 3 ++-
>> + lib/freading.c | 3 ++-
>> + lib/freadptr.c | 3 ++-
>> + lib/freadseek.c | 3 ++-
>> + lib/fseeko.c | 6 ++++--
>> + lib/fseterr.c | 3 ++-
>> + 9 files changed, 24 insertions(+), 12 deletions(-)
>> +
>> +diff --git a/lib/fflush.c b/lib/fflush.c
>> +index c16da5fdcf23..b69206296e9a 100644
>> +--- a/lib/fflush.c
>> ++++ b/lib/fflush.c
>> +@@ -33,7 +33,8 @@
>> + #undef fflush
>> +
>> +
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++/* GNU libc, BeOS, Haiku, Linux libc5 */
>> +
>> + /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
>> + static void
>> +@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp)
>> +
>> + #endif
>> +
>> +-#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
>> ++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1)
>> ++/* GNU libc, BeOS, Haiku, Linux libc5 */
>> +
>> + # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream)
>> + if (stream == NULL || ! freading (stream))
>> + return fflush (stream);
>> +
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> +
>> + clear_ungetc_buffer_preserving_position (stream);
>> +
>> +diff --git a/lib/fpending.c b/lib/fpending.c
>> +index 9e21a165e220..0c3b931dba9a 100644
>> +--- a/lib/fpending.c
>> ++++ b/lib/fpending.c
>> +@@ -32,7 +32,8 @@ __fpending (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + return fp->_IO_write_ptr - fp->_IO_write_base;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +diff --git a/lib/fpurge.c b/lib/fpurge.c
>> +index 3a160004d49d..4558ab9a0783 100644
>> +--- a/lib/fpurge.c
>> ++++ b/lib/fpurge.c
>> +@@ -62,7 +62,8 @@ fpurge (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_IO_read_end = fp->_IO_read_ptr;
>> + fp->_IO_write_ptr = fp->_IO_write_base;
>> + /* Avoid memory leak when there is an active ungetc buffer. */
>> +diff --git a/lib/freadahead.c b/lib/freadahead.c
>> +index e7cb77b6722b..496686042d1e 100644
>> +--- a/lib/freadahead.c
>> ++++ b/lib/freadahead.c
>> +@@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *);
>> + size_t
>> + freadahead (FILE *fp)
>> + {
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + if (fp->_IO_write_ptr > fp->_IO_write_base)
>> + return 0;
>> + return (fp->_IO_read_end - fp->_IO_read_ptr)
>> +diff --git a/lib/freading.c b/lib/freading.c
>> +index c9d33449e948..5e66df1dc7dd 100644
>> +--- a/lib/freading.c
>> ++++ b/lib/freading.c
>> +@@ -31,7 +31,8 @@ freading (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + return ((fp->_flags & _IO_NO_WRITES) != 0
>> + || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
>> + && fp->_IO_read_base != NULL));
>> +diff --git a/lib/freadptr.c b/lib/freadptr.c
>> +index aba8dd5964fc..e82b41e3f4d9 100644
>> +--- a/lib/freadptr.c
>> ++++ b/lib/freadptr.c
>> +@@ -29,7 +29,8 @@ freadptr (FILE *fp, size_t *sizep)
>> + size_t size;
>> +
>> + /* Keep this code in sync with freadahead! */
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + if (fp->_IO_write_ptr > fp->_IO_write_base)
>> + return NULL;
>> + size = fp->_IO_read_end - fp->_IO_read_ptr;
>> +diff --git a/lib/freadseek.c b/lib/freadseek.c
>> +index 98726f845f88..f547bfd4257b 100644
>> +--- a/lib/freadseek.c
>> ++++ b/lib/freadseek.c
>> +@@ -36,7 +36,8 @@ freadptrinc (FILE *fp, size_t increment)
>> + /* Keep this code in sync with freadptr! */
>> + #if HAVE___FREADPTRINC /* musl libc */
>> + __freadptrinc (fp, increment);
>> +-#elif defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#elif defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_IO_read_ptr += increment;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +diff --git a/lib/fseeko.c b/lib/fseeko.c
>> +index 0ae2b153cff5..ee8efa49ac34 100644
>> +--- a/lib/fseeko.c
>> ++++ b/lib/fseeko.c
>> +@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence)
>> + #endif
>> +
>> + /* These tests are based on fpurge.c. */
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + if (fp->_IO_read_end == fp->_IO_read_ptr
>> + && fp->_IO_write_ptr == fp->_IO_write_base
>> + && fp->_IO_save_base == NULL)
>> +@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence)
>> + return -1;
>> + }
>> +
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_flags &= ~_IO_EOF_SEEN;
>> + fp->_offset = pos;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> +diff --git a/lib/fseterr.c b/lib/fseterr.c
>> +index d998619771f3..23f4e3593800 100644
>> +--- a/lib/fseterr.c
>> ++++ b/lib/fseterr.c
>> +@@ -29,7 +29,8 @@ fseterr (FILE *fp)
>> + /* Most systems provide FILE as a struct and the necessary bitmask in
>> + <stdio.h>, because they need it for implementing getc() and putc() as
>> + fast macros. */
>> +-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
>> ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
>> ++ /* GNU libc, BeOS, Haiku, Linux libc5 */
>> + fp->_flags |= _IO_ERR_SEEN;
>> + #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
>> + /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
>> +--
>> +2.20.1
>> +
>> diff --git a/meta/recipes-core/coreutils/coreutils_8.29.bb b/meta/recipes-core/coreutils/coreutils_8.29.bb
>> index b0572afdc001..3c72bdd75023 100644
>> --- a/meta/recipes-core/coreutils/coreutils_8.29.bb
>> +++ b/meta/recipes-core/coreutils/coreutils_8.29.bb
>> @@ -21,6 +21,8 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
>> file://0001-local.mk-fix-cross-compiling-problem.patch \
>> file://CVE-2017-18018-1.patch \
>> file://CVE-2017-18018-2.patch \
>> + file://0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch \
>> + file://0002-fflush-be-more-paranoid-about-libio.h-change.patch \
>> "
>>
>> SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303"
>
More information about the Openembedded-core
mailing list