From e46396449faa33de32a67948c884461b8e8d088b Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 23 Aug 2018 07:06:48 +0200 Subject: [PATCH 1/4] bison: Update to 3.0.5 --- packages/devel/bison/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk index 5ed2f6332d..f79c8577fb 100644 --- a/packages/devel/bison/package.mk +++ b/packages/devel/bison/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) PKG_NAME="bison" -PKG_VERSION="3.0.4" -PKG_SHA256="a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1" +PKG_VERSION="3.0.5" +PKG_SHA256="075cef2e814642e30e10e8155e93022e4a91ca38a65aa1d5467d4e969f97f338" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/bison/" From 04101db8a38556edba516e93aac4725364b50289 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 23 Aug 2018 07:07:45 +0200 Subject: [PATCH 2/4] squashfs: Fix missing include with newer glibc --- .../squashfs/patches/fix-compilation-issue.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/sysutils/squashfs/patches/fix-compilation-issue.patch diff --git a/packages/sysutils/squashfs/patches/fix-compilation-issue.patch b/packages/sysutils/squashfs/patches/fix-compilation-issue.patch new file mode 100644 index 0000000000..7b50a51fa8 --- /dev/null +++ b/packages/sysutils/squashfs/patches/fix-compilation-issue.patch @@ -0,0 +1,11 @@ +diff -Nur a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c +--- a/squashfs-tools/mksquashfs.c 2017-11-14 04:44:47.000000000 +0100 ++++ b/squashfs-tools/mksquashfs.c 2018-08-22 16:52:17.386482046 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 4d6eb422bc4905bbc370791ba3ae659f97c59399 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 23 Aug 2018 07:08:13 +0200 Subject: [PATCH 3/4] populatefs: Fix missing include with newer glibc --- .../populatefs/patches/fix-compilation-issue.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/tools/populatefs/patches/fix-compilation-issue.patch diff --git a/packages/tools/populatefs/patches/fix-compilation-issue.patch b/packages/tools/populatefs/patches/fix-compilation-issue.patch new file mode 100644 index 0000000000..e9b360ccae --- /dev/null +++ b/packages/tools/populatefs/patches/fix-compilation-issue.patch @@ -0,0 +1,11 @@ +diff -Nur a/src/mod_path.c b/src/mod_path.c +--- a/src/mod_path.c 2016-02-24 04:15:10.000000000 +0100 ++++ b/src/mod_path.c 2018-08-22 16:58:11.884462070 +0200 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include + #include + #include From 4a97b7f3a9ee1fa9ffa9c47aac4461c3a0bd56b2 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 23 Aug 2018 07:19:46 +0200 Subject: [PATCH 4/4] m4: Fix building with newer glibc --- .../fix-compilation-with-glibc-2.28.patch | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch diff --git a/packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch b/packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch new file mode 100644 index 0000000000..325be90741 --- /dev/null +++ b/packages/devel/m4/patches/fix-compilation-with-glibc-2.28.patch @@ -0,0 +1,125 @@ +Those are changes from upstream gnulib commit which fixes compilation with glibc 2.28. + +diff --git a/lib/fflush.c b/lib/fflush.c +index 983ade0..a6edfa1 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 c84e3a5..789f50e 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 + , 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 b1d417c..3aedcc3 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 + , 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 c2ecb5b..23ec76e 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 73c28ac..c24d0c8 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 + , 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 0101ab5..193f4e8 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__ +--- 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. */ + +-- +1.9.1 +