Skip to content

W
White Rabbit Switch - Software
Commit 5fe5089d authored by Adam Wujek's avatar Adam Wujek
Browse files
Options

[BUG: #246] patches/buildroot: fix build errors on ubuntu 20.04 

Signed-off-by: 's avatarAdam Wujek <dev_public@wujek.eu>
parent a8311e1c
Pipeline #2021 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 202 additions and 0 deletions
    patches/buildroot/0026-fix-compilation-error-of-m4-on-ubuntu-20.04.patch 0 → 100644
    View file @ 5fe5089d
    From 4e77f70bf0a26f6af20138b7686e54b3e0884437 Mon Sep 17 00:00:00 2001
    From: Adam Wujek <dev_public@wujek.eu>
    Date: Sun, 15 Aug 2021 02:38:45 +0200
    Subject: [PATCH 1/2] fix compilation of error of m4 on ubuntu 20.04
    Signed-off-by: Adam Wujek <dev_public@wujek.eu>
    ---
    ...x-compilation-of-m4-for-ubuntu-20.04.patch | 129 ++++++++++++++++++
    1 file changed, 129 insertions(+)
    create mode 100644 package/m4/0001-fix-compilation-of-m4-for-ubuntu-20.04.patch
    diff --git a/package/m4/0001-fix-compilation-of-m4-for-ubuntu-20.04.patch b/package/m4/0001-fix-compilation-of-m4-for-ubuntu-20.04.patch
    new file mode 100644
    index 0000000..c379a6a
    --- /dev/null
    +++ b/package/m4/0001-fix-compilation-of-m4-for-ubuntu-20.04.patch
    @@ -0,0 +1,129 @@
    +From 76e0211c3eaaee481ab1f9548ab15d94885fd12a Mon Sep 17 00:00:00 2001
    +From: Adam Wujek <dev_public@wujek.eu>
    +Date: Sun, 15 Aug 2021 02:36:16 +0200
    +Subject: [PATCH] fix compilation of m4 for ubuntu 20.04
    +
    +https://raw.githubusercontent.com/chef/omnibus-software/master/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch
    +
    +Signed-off-by: Adam Wujek <dev_public@wujek.eu>
    +---
    + lib/fflush.c | 6 +++---
    + lib/fpurge.c | 2 +-
    + lib/freadahead.c | 2 +-
    + lib/freading.c | 2 +-
    + lib/fseeko.c | 4 ++--
    + lib/stdio-impl.h | 6 ++++++
    + 6 files changed, 14 insertions(+), 8 deletions(-)
    +
    +diff --git a/lib/fflush.c b/lib/fflush.c
    +index 8ac5dea..0c82feb 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
    +@@ -71,7 +71,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 __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
    +
    +@@ -145,7 +145,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/fpurge.c b/lib/fpurge.c
    +index e00187d..a60f0ae 100644
    +--- a/lib/fpurge.c
    ++++ b/lib/fpurge.c
    +@@ -61,7 +61,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 f2dae46..1ee86b0 100644
    +--- a/lib/freadahead.c
    ++++ b/lib/freadahead.c
    +@@ -25,7 +25,7 @@
    + 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 8012a7a..61dda1a 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/fseeko.c b/lib/fseeko.c
    +index c03be3d..d01397e 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)
    +@@ -121,7 +121,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__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
    +diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
    +index 45291cf..89e26c1 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.25.1
    +
    --
    2.25.1
    patches/buildroot/0027-fix-compilation-error-of-bison-on-ubuntu-20.04.patch 0 → 100644
    View file @ 5fe5089d
    From 4f22225f53f997c120f7de21022a43d794bf2d2c Mon Sep 17 00:00:00 2001
    From: Adam Wujek <dev_public@wujek.eu>
    Date: Tue, 31 Aug 2021 16:47:01 +0200
    Subject: [PATCH] fix compilation error of bison on ubuntu 20.04
    Signed-off-by: Adam Wujek <dev_public@wujek.eu>
    ---
    .../bison/0001-glibc-change-work-around.patch | 33 +++++++++++++++++++
    1 file changed, 33 insertions(+)
    create mode 100644 package/bison/0001-glibc-change-work-around.patch
    diff --git a/package/bison/0001-glibc-change-work-around.patch b/package/bison/0001-glibc-change-work-around.patch
    new file mode 100644
    index 0000000..e6daf0e
    --- /dev/null
    +++ b/package/bison/0001-glibc-change-work-around.patch
    @@ -0,0 +1,33 @@
    +Subject: Workaround change in glibc
    +
    +Temporary workaround to compile with glibc 2.28, which
    +deprecated some constants
    +
    +Based on the workaround made for the tools/m4 package
    +
    +--- 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. */
    +
    +--- a/lib/fseterr.c
    ++++ b/lib/fseterr.c
    +@@ -29,7 +29,7 @@
    + /* 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__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
    + fp_->_flags |= __SERR;
    --
    2.25.1
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment