* Re: [PR PATCH] [Updated] m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
@ 2021-10-24 17:32 ` paper42
2021-10-30 19:07 ` ericonr
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2021-10-24 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages m4
https://github.com/void-linux/void-packages/pull/33730
m4: update to 1.4.19.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33730.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-m4-33730.patch --]
[-- Type: text/x-diff, Size: 8642 bytes --]
From 656c147865cabbbd880bcc257c4959e66358446f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Oct 2021 19:25:52 +0200
Subject: [PATCH] m4: update to 1.4.19.
---
srcpkgs/m4/patches/fix-glibc-2.27.patch | 167 ------------------------
srcpkgs/m4/template | 12 +-
2 files changed, 6 insertions(+), 173 deletions(-)
delete mode 100644 srcpkgs/m4/patches/fix-glibc-2.27.patch
diff --git a/srcpkgs/m4/patches/fix-glibc-2.27.patch b/srcpkgs/m4/patches/fix-glibc-2.27.patch
deleted file mode 100644
index 59d33cff164d..000000000000
--- a/srcpkgs/m4/patches/fix-glibc-2.27.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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.
-
-[yann.morin.1998@free.fr: partially backport from upstream gnulib]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
- 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/build-aux/gnulib/lib/fflush.c
-index 983ade0ff..a6edfa105 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/build-aux/gnulib/lib/fpending.c
-index c84e3a5b4..789f50e4e 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/build-aux/gnulib/lib/fpurge.c
-index b1d417c7a..3aedcc373 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/build-aux/gnulib/lib/freadahead.c
-index c2ecb5b28..23ec76ee5 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/build-aux/gnulib/lib/freading.c
-index 73c28acdd..c24d0c88a 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/build-aux/gnulib/lib/fseeko.c
-index 0101ab55f..193f4e8ce 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/build-aux/gnulib/lib/stdio-impl.h
-index 78d896e9f..05c5752a2 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.14.1
-
-
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 78f3dae6184a..762593d883bd 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -1,17 +1,17 @@
# Template file for 'm4'
pkgname=m4
-version=1.4.18
-revision=2
+version=1.4.19
+revision=1
bootstrap=yes
-replaces="chroot-m4>=0"
build_style=gnu-configure
configure_args="--enable-changeword --enable-threads"
short_desc="GNU version of UNIX m4 macro language processor"
-homepage="https://www.gnu.org/software/m4/"
-license="GPL-3.0-or-later"
maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/m4/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
+checksum=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
+replaces="chroot-m4>=0"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export ac_cv_lib_error_at_line=no
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
2021-10-24 17:32 ` [PR PATCH] [Updated] " paper42
@ 2021-10-30 19:07 ` ericonr
2022-04-13 12:36 ` tibequadorian
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-10-30 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2652 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-955578597
Comment:
```
case $- in *e*) set +e;; esac; srcdirstrip=`echo "." | sed 's|.|.|g'`; case $p in ./*) f=`echo "$p" | sed "s|^$srcdirstrip/||"`;; *) f=$p;; esac; { mgn= red= grn= lgn= blu= brg= std=; am__color_tests=no; if test "X" = Xno; then am__color_tests=no; elif test "X" = Xalways; then am__color_tests=yes; elif test "X$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then am__color_tests=yes; fi; if test $am__color_tests = yes; then red=''; grn=''; lgn=''; blu=''; mgn=''; brg=''; std=''; fi; }; srcdir=.; export srcdir; case "test-mbrtowc4.sh.log" in */*) am__odir=`echo "./test-mbrtowc4.sh.log" | sed 's|/[^/]*$||'`;; *) am__odir=.;; esac; test "x$am__odir" = x"." || test -d "$am__odir" || /usr/bin/mkdir -p "$am__odir" || exit $?; if test -f "./$f"; then dir=./; elif test -f "$f"; then dir=; else dir="./"; fi; tst=$dir$f; log='test-mbrtowc4.sh.log'; if test -n ''; then am__enable_hard_errors=no; else am__enable_hard_errors=yes; fi; case " " in *[\ \ ]$f[\ \ ]* | *[\ \ ]$dir$f[\ \ ]*) am__expect_failure=yes;; *) am__expect_failure=no;; esac; EXEEXT='' srcdir='.' LOCALE_FR='none' LOCALE_FR_UTF8='none' LIBSIGSEGV='' LOCALE_FR='none' LOCALE_TR_UTF8='none' LOCALE_FR='none' LOCALE_FR_UTF8='none' LOCALE_JA='none' LOCALE_ZH_CN='none' LOCALE_FR='none' LOCALE_FR_UTF8='none' LOCALE_JA='none' LOCALE_ZH_CN='none' LOCALE_FR='none' LOCALE_FR_UTF8='none' LOCALE_JA='none' LOCALE_ZH_CN='none' LOCALE_FR_UTF8='none' LOCALE_FR_UTF8='none' LOCALE_ZH_CN='none' LOCALE_FR='none' LOCALE_FR_UTF8='none' LOCALE_FR='none' LOCALE_FR_UTF8='none' LOCALE_JA='none' LOCALE_ZH_CN='none' LOCALE_FR='none' LOCALE_FR_UTF8='none' abs_aux_dir='/builddir/m4-1.4.19/build-aux' abs_aux_dir='/builddir/m4-1.4.19/build-aux' MAKE='make' LOCALE_FR='none' LOCALE_FR_UTF8='none' LOCALE_JA='none' LOCALE_ZH_CN='none' /bin/sh ../build-aux/test-driver --test-name "$f" \
--log-file $b.log --trs-file $b.trs \
--color-tests "$am__color_tests" --enable-hard-errors "$am__enable_hard_errors" --expect-failure "$am__expect_failure" -- \
"$tst"
../build-aux/test-driver: the following mandatory options are missing: --test-name
Usage:
test-driver --test-name NAME --log-file PATH --trs-file PATH
[--expect-failure {yes|no}] [--color-tests {yes|no}]
[--enable-hard-errors {yes|no}] [--]
TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
The '--test-name', '--log-file' and '--trs-file' options are mandatory.
```
this test failure is new, I wonder what's up. Looks to be `"$f"` possibly being empty?
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
2021-10-24 17:32 ` [PR PATCH] [Updated] " paper42
2021-10-30 19:07 ` ericonr
@ 2022-04-13 12:36 ` tibequadorian
2022-04-13 12:39 ` tibequadorian
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tibequadorian @ 2022-04-13 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-1097999867
Comment:
It looks like `sed -i '/test-mbrtowc5.sh/d' tests/Makefile` in `pre_check()` is the problem.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (2 preceding siblings ...)
2022-04-13 12:36 ` tibequadorian
@ 2022-04-13 12:39 ` tibequadorian
2022-04-14 14:19 ` tibequadorian
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tibequadorian @ 2022-04-13 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-1097999867
Comment:
It looks like `sed -i '/test-mbrtowc5.sh/d' tests/Makefile` in `pre_check()` is the problem. It works when I remove this line.
Then `test-getcwd.sh` is failing but thats another issue :)
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (3 preceding siblings ...)
2022-04-13 12:39 ` tibequadorian
@ 2022-04-14 14:19 ` tibequadorian
2022-07-14 2:13 ` github-actions
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tibequadorian @ 2022-04-14 14:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
New comment by tibequadorian on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-1099236281
Comment:
I found out that test-getcwd is failing on musl because `cwd_len` gets too long (> 12333 in my testing). errno is also set to ENAMETOOLONG. Maybe this helps...
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (4 preceding siblings ...)
2022-04-14 14:19 ` tibequadorian
@ 2022-07-14 2:13 ` github-actions
2022-09-08 2:03 ` [PR PATCH] [Updated] " classabbyamp
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2022-07-14 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-1183904908
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (5 preceding siblings ...)
2022-07-14 2:13 ` github-actions
@ 2022-09-08 2:03 ` classabbyamp
2022-09-08 2:03 ` classabbyamp
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-09-08 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/paper42/void-packages m4
https://github.com/void-linux/void-packages/pull/33730
m4: update to 1.4.19.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33730.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-m4-33730.patch --]
[-- Type: text/x-diff, Size: 9103 bytes --]
From 46ea222f1321ae3ace16cfae6a20fbf9fde28457 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Oct 2021 19:25:52 +0200
Subject: [PATCH] m4: update to 1.4.19.
---
srcpkgs/m4/patches/fix-glibc-2.27.patch | 167 ------------------------
srcpkgs/m4/template | 22 ++--
2 files changed, 8 insertions(+), 181 deletions(-)
delete mode 100644 srcpkgs/m4/patches/fix-glibc-2.27.patch
diff --git a/srcpkgs/m4/patches/fix-glibc-2.27.patch b/srcpkgs/m4/patches/fix-glibc-2.27.patch
deleted file mode 100644
index 59d33cff164d..000000000000
--- a/srcpkgs/m4/patches/fix-glibc-2.27.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-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.
-
-[yann.morin.1998@free.fr: partially backport from upstream gnulib]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
- 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/build-aux/gnulib/lib/fflush.c
-index 983ade0ff..a6edfa105 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/build-aux/gnulib/lib/fpending.c
-index c84e3a5b4..789f50e4e 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/build-aux/gnulib/lib/fpurge.c
-index b1d417c7a..3aedcc373 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/build-aux/gnulib/lib/freadahead.c
-index c2ecb5b28..23ec76ee5 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/build-aux/gnulib/lib/freading.c
-index 73c28acdd..c24d0c88a 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/build-aux/gnulib/lib/fseeko.c
-index 0101ab55f..193f4e8ce 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/build-aux/gnulib/lib/stdio-impl.h
-index 78d896e9f..05c5752a2 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.14.1
-
-
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index 78f3dae6184a..a25de6b89e32 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -1,17 +1,17 @@
# Template file for 'm4'
pkgname=m4
-version=1.4.18
-revision=2
+version=1.4.19
+revision=1
bootstrap=yes
-replaces="chroot-m4>=0"
build_style=gnu-configure
configure_args="--enable-changeword --enable-threads"
short_desc="GNU version of UNIX m4 macro language processor"
-homepage="https://www.gnu.org/software/m4/"
-license="GPL-3.0-or-later"
maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://www.gnu.org/software/m4/"
distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
+checksum=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
+replaces="chroot-m4>=0"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
export ac_cv_lib_error_at_line=no
@@ -27,13 +27,7 @@ fi
pre_check() {
case "$XBPS_TARGET_MACHINE" in
- *-musl* )
- # Disable locale tests that fail on musl
- sed -i '/test-localename$(EXEEXT)/d' tests/Makefile
- sed -i '/test-mbrtowc5.sh/d' tests/Makefile
-
- # Fails because test-localename doesn't work on musl
- sed -i '/test-localeconv$(EXEEXT)/d' tests/Makefile
- ;;
+ # Disable tests that fail on musl
+ *-musl) sed -i '/test-getcwd.sh/d' tests/Makefile ;;
esac
}
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (6 preceding siblings ...)
2022-09-08 2:03 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-09-08 2:03 ` classabbyamp
2022-09-10 13:42 ` paper42
2022-09-10 13:43 ` [PR PATCH] [Merged]: " paper42
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-09-08 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-1240129648
Comment:
fixed the failing test on musl (it was actually a different one that was failing)
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (7 preceding siblings ...)
2022-09-08 2:03 ` classabbyamp
@ 2022-09-10 13:42 ` paper42
2022-09-10 13:43 ` [PR PATCH] [Merged]: " paper42
9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-09-10 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/33730#issuecomment-1242732002
Comment:
> fixed the failing test on musl (it was actually a different one that was failing)
thanks a lot
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Merged]: m4: update to 1.4.19.
2021-10-24 17:29 [PR PATCH] m4: update to 1.4.19 paper42
` (8 preceding siblings ...)
2022-09-10 13:42 ` paper42
@ 2022-09-10 13:43 ` paper42
9 siblings, 0 replies; 11+ messages in thread
From: paper42 @ 2022-09-10 13:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1432 bytes --]
There's a merged pull request on the void-packages repository
m4: update to 1.4.19.
https://github.com/void-linux/void-packages/pull/33730
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 11+ messages in thread