From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Andreas Helmcke <ahelmcke@ela-soft.com>
Subject: Re: [ptxdist] [APPLIED] m4-host: Version bump, 1.4.18 -> 1.4.19
Date: Tue, 26 Oct 2021 11:09:24 +0200 [thread overview]
Message-ID: <20211026090924.1681885-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20211018134112.667846-1-ahelmcke@ela-soft.com>
Thanks, applied as 452b98d8451a9eec16ab1339a271df14ee928750.
Michael
[sent from post-receive hook]
On Tue, 26 Oct 2021 11:09:24 +0200, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> Version bump to fix build problems with glibc 2.34
>
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <20211018134112.667846-1-ahelmcke@ela-soft.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
> deleted file mode 100644
> index 00b99fdd9a05..000000000000
> --- a/patches/m4-1.4.18/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
> +++ /dev/null
> @@ -1,159 +0,0 @@
> -From: Paul Eggert <eggert@cs.ucla.edu>
> -Date: Thu, 8 Mar 2018 16:42:45 2018 -0800
> -Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
> -
> -Problem reported by Daniel P. Berrangé in:
> -https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
> -* lib/fbufmode.c (fbufmode):
> -* lib/fflush.c (clear_ungetc_buffer_preserving_position)
> -(disable_seek_optimization, rpl_fflush):
> -* lib/fpending.c (__fpending):
> -* lib/fpurge.c (fpurge):
> -* lib/freadable.c (freadable):
> -* lib/freadahead.c (freadahead):
> -* lib/freading.c (freading):
> -* lib/freadptr.c (freadptr):
> -* lib/freadseek.c (freadptrinc):
> -* lib/fseeko.c (fseeko):
> -* lib/fseterr.c (fseterr):
> -* lib/fwritable.c (fwritable):
> -* lib/fwriting.c (fwriting):
> -Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
> -* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
> -Define if not already defined.
> -
> -manual backport of of4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
> -
> -Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ----
> - lib/fflush.c | 6 +++---
> - lib/fpending.c | 2 +-
> - lib/fpurge.c | 2 +-
> - lib/freadahead.c | 2 +-
> - lib/freading.c | 2 +-
> - lib/fseeko.c | 4 ++--
> - lib/stdio-impl.h | 6 ++++++
> - 7 files changed, 15 insertions(+), 9 deletions(-)
> -
> -diff --git a/lib/fflush.c b/lib/fflush.c
> -index ef2a7f1237ee..787790d09031 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, 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 ce93604e518f..9fe7ffb2f615 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, Android */
> -diff --git a/lib/fpurge.c b/lib/fpurge.c
> -index 53ee68c37efc..7cba3a37bef2 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 cfc969b4cffd..5e43e13af727 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 05cb0b80999d..f1da5b958b5e 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 0c01c4fd08c1..0601619d80a2 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/stdio-impl.h b/lib/stdio-impl.h
> -index 766d6936590f..75fe3ade4237 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. */
> -
> diff --git a/patches/m4-1.4.18/series b/patches/m4-1.4.18/series
> deleted file mode 100644
> index c9993f08655d..000000000000
> --- a/patches/m4-1.4.18/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
> -# b03bed9248af170f04892265a5918d5b - git-ptx-patches magic
> diff --git a/rules/host-m4.make b/rules/host-m4.make
> index 9264fe5c9740..1cf6cd111880 100644
> --- a/rules/host-m4.make
> +++ b/rules/host-m4.make
> @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_M4) += host-m4
> #
> # Paths and names
> #
> -HOST_M4_VERSION := 1.4.18
> -HOST_M4_MD5 := 730bb15d96fffe47e148d1e09235af82
> +HOST_M4_VERSION := 1.4.19
> +HOST_M4_MD5 := 0d90823e1426f1da2fd872df0311298d
> HOST_M4 := m4-$(HOST_M4_VERSION)
> HOST_M4_SUFFIX := tar.xz
> HOST_M4_URL := http://ftp.gnu.org/gnu/m4/$(HOST_M4).$(HOST_M4_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2021-10-26 9:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 13:41 [ptxdist] [PATCH] " Andreas Helmcke
2021-10-26 9:09 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211026090924.1681885-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ahelmcke@ela-soft.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox