Mercurial > mxe-octave

changeset 5769:5bf7c01b1bf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build-m4: Update to version 1.4.18 * src/build-m4.mk: Update version and checksum. * src/build-m4-glibc2-28.patch: Remove patch that is no longer needed. * dist-files.mk: Remove deleted file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 03 Jun 2021 10:40:36 +0200
parents f07e1bce8820
children c23139e3560e
files dist-files.mk src/build-m4-glibc2-28.patch src/build-m4.mk
diffstat 3 files changed, 3 insertions(+), 127 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed May 26 08:18:25 2021 -0400
+++ b/dist-files.mk	Thu Jun 03 10:40:36 2021 +0200
@@ -33,7 +33,6 @@
   build-gperf.mk \
   build-libtool.mk \
   build-lzip.mk \
-  build-m4-glibc2-28.patch \
   build-m4.mk \
   build-mako.mk \
   build-markupsafe.mk \
--- a/src/build-m4-glibc2-28.patch	Wed May 26 08:18:25 2021 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-# This file is based on a Debian patch:
-# https://launchpadlibrarian.net/392968582/m4_1.4.18-1_1.4.18-1ubuntu1.diff.gz
-
-diff -upr a/lib/fflush.c b/lib/fflush.c
---- a/lib/fflush.c     2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/fflush.c     2018-08-08 16:12:40.522952171 +0800
-@@ -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 -upr a/lib/fpending.c b/lib/fpending.c
---- a/lib/fpending.c     2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/fpending.c     2018-08-08 16:12:40.522952171 +0800
-@@ -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 -upr a/lib/fpurge.c b/lib/fpurge.c
---- a/lib/fpurge.c     2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/fpurge.c     2018-08-08 16:12:40.522952171 +0800
-@@ -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 -upr a/lib/freadahead.c b/lib/freadahead.c
---- a/lib/freadahead.c     2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/freadahead.c     2018-08-08 16:12:40.522952171 +0800
-@@ -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 -upr a/lib/freading.c b/lib/freading.c
---- a/lib/freading.c    2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/freading.c    2018-08-08 16:13:12.399618677 +0800
-@@ -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 -upr a/lib/fseeko.c b/lib/fseeko.c
---- a/lib/fseeko.c    2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/fseeko.c    2018-08-08 16:13:12.399618677 +0800
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
- #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 when
-           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 -upr a/lib/stdio-impl.h b/lib/stdio-impl.h
---- a/lib/stdio-impl.h    2016-12-31 21:54:41.000000000 +0800
-+++ b/lib/stdio-impl.h    2018-08-08 16:13:12.399618677 +0800
-@@ -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/src/build-m4.mk	Wed May 26 08:18:25 2021 -0400
+++ b/src/build-m4.mk	Thu Jun 03 10:40:36 2021 +0200
@@ -3,10 +3,10 @@
 
 PKG             := build-m4
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.18
-$(PKG)_CHECKSUM := 2f76f8105a45b05c8cfede97b3193cd88b31c657
+$(PKG)_VERSION  := 1.4.19
+$(PKG)_CHECKSUM := b44b5c9746b69ee19204b7cb76d3a7b3eac69259
 $(PKG)_SUBDIR   := m4-$($(PKG)_VERSION)
-$(PKG)_FILE     := m4-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := m4-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE)
 $(PKG)_DEPS     :=