m4: Upgrade to 1.4.20 release
PATCH v2 1/1 m4: Upgrade to 1.4.20 release
This has been 4 years in making, it has fixes to build with gcc-15 and some patches are upstream [1] [2]
This release collects several years of portability improvements, as well as a couple of minor optimizations to performance. Notable improvements in this release include faster execution of the 'eval' builtin. More details [3]
[1] https://github.com/coreutils/gnulib/commit/2d830e4a792fcd9f614ed08a7f18584b8b21d23b
[2] https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c
[3] https://lists.gnu.org/archive/html/m4-announce/2025-05/msg00000.html
Signed-off-by Khem Raj <[email protected]>
---
v2: Fix do_install_ptest builds
.../m4/{m4-1.4.19.inc => m4-1.4.20.inc} | 10 +---
...4-native_1.4.19.bb => m4-native_1.4.20.bb} | 0
...lot-using-_Alignof-when-using-C11-or.patch | 49 -------------------
.../0001-sigsegv-Fix-build-on-ppc-musl.patch | 37 --------------
.../m4/m4/ac_config_links.patch | 37 --------------
.../m4/m4/serial-tests-config.patch | 11 ++---
.../m4/{m4_1.4.19.bb => m4_1.4.20.bb} | 0
7 files changed, 5 insertions(+), 139 deletions(-)
rename meta/recipes-devtools/m4/{m4-1.4.19.inc => m4-1.4.20.inc} (84%)
rename meta/recipes-devtools/m4/{m4-native_1.4.19.bb => m4-native_1.4.20.bb} (100%)
delete mode 100644 meta/recipes-devtools/m4/m4/0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch
delete mode 100644 meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch
delete mode 100644 meta/recipes-devtools/m4/m4/ac_config_links.patch
rename meta/recipes-devtools/m4/{m4_1.4.19.bb => m4_1.4.20.bb} (100%)meta/recipes-devtools/m4/m4-1.4.20.inc renamed from meta/recipes-devtools/m4/m4-1.4.19.inc +2 -8
@@ -7,15 +7,12 @@ GNU M4 also has built-in functions for including files, running shell commands, inherit autotools texinfo ptest gettext SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ - file://ac_config_links.patch \ - file://0001-sigsegv-Fix-build-on-ppc-musl.patch \ - file://0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch \ " SRC_URI:append:class-target = " file://run-ptest \ file://serial-tests-config.patch \ " -SRC_URI[sha256sum] = "3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70" +SRC_URI[sha256sum] = "6ac4fc31ce440debe63987c2ebbf9d7b6634e67a7c3279257dc7361de8bdb3ef" LICENSE = "GPL-3.0-only"
@@ -26,8 +23,6 @@ EXTRA_OECONF += "--without-libsigsegv-prefix" EXTRA_OEMAKE += "'infodir=${infodir}'" -CFLAGS += "-std=gnu17" - do_compile_ptest() { cd ${B}/tests sed -i '/^buildtest-TESTS: /c buildtest-TESTS: $(TESTS) $(check_LIBRARIES) $(check_PROGRAMS)' Makefile
@@ -41,7 +36,7 @@ do_install_ptest() { find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} cp ${S}/build-aux/update-copyright ${D}${PTEST_PATH}/tests/ sed -i 's;update-copyright;./update-copyright;g' ${D}${PTEST_PATH}/tests/test-update-copyright.sh - chmod 0755 ${D}${PTEST_PATH}/tests/test-mbrtowc-w32-1.sh ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \ + chmod 0755 ${D}${PTEST_PATH}/tests/test-spawn-pipe-main \ ${D}${PTEST_PATH}/tests/test-spawn-pipe-child ${D}${PTEST_PATH}/tests/test-version-etc \ ${D}${PTEST_PATH}/tests/test-xalloc-die
@@ -59,4 +54,3 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ locale-base-fr-fr.iso-8859-1 \ glibc-gconv-iso8859-1 \ " -
meta/recipes-devtools/m4/m4-native_1.4.20.bb renamed from meta/recipes-devtools/m4/m4-native_1.4.19.bb +0 -0
meta/recipes-devtools/m4/m4/0001-Define-alignof_slot-using-_Alignof-when-using-C11-or.patch deleted +0 -49
49 lines not on this page · raw message
meta/recipes-devtools/m4/m4/0001-sigsegv-Fix-build-on-ppc-musl.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From 36d5e26f606e070553eb0fff1f738e61970be5d7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 9 Mar 2022 20:22:20 -0800 -Subject: [PATCH] sigsegv: Fix build on ppc/musl - -mcontext is not a standard layout so glibc and musl differ sadly. - -Fixes -../../m4-1.4.19/lib/sigsegv.c: In function 'sigsegv_handler': ../../m4-1.4.19/lib/sigsegv.c:223:75: error: 'mcontext_t' has no member named 'uc_regs'; did you mean 'gregs'? 223 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ^~~~~~~ - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/m4-patches/2022-03/msg00000.html] -Signed-off-by: Khem Raj <[email protected]> ---- - lib/sigsegv.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index 696a152..fa0c465 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -217,10 +217,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ - /* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if ! defined __GLIBC__ -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] - # else --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] - # endif - # endif - --- -2.35.1 -
meta/recipes-devtools/m4/m4/ac_config_links.patch deleted +0 -37
@@ -1,37 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -This patch fixes a build problem for m4-native experienced on Ubuntu 9.10, -where autoconf/automake (AC_CONFIG_LINKS) ends up making GNUmakefile a -symlink to itself. - -The patch comments out ac_config_links directly in configure, -as autoreconf is not actually run for m4-native. - -I believe it should be safe, as GNUmakefile is actually unpacked from -source, and what we want is to is to not touch it. - -Tested on x86_64_linux (Ubuntu 8.04 and 9.10). - -2009-11-10 Esben Haabendal <[email protected]> ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 883336a..6343a34 100755 ---- a/configure -+++ b/configure -@@ -37061,8 +37061,8 @@ printf "%s\n" "#define GNULIB_TEST_GETRANDOM 1" >>confdefs.h - # only, it does not matter if we skip the link with older autoconf. - # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH - # builds, so use a shell variable to bypass this. -- GNUmakefile=GNUmakefile -- ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" -+# GNUmakefile=GNUmakefile -+# ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - - - LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL" --- -2.25.1 -
meta/recipes-devtools/m4/m4/serial-tests-config.patch +3 -8
@@ -12,19 +12,14 @@ Signed-off-by: Changqing Li <[email protected]> configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 78b8788..931fa6f 100644 --- a/configure.ac +++ b/configure.ac -@@ -22,7 +22,7 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/git-version-gen .tarball-version]), +@@ -22,7 +22,7 @@ AC_INIT([GNU M4], m4_esyscmd([build-aux/ [[email protected]]) AC_CONFIG_AUX_DIR([build-aux]) --AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests parallel-tests -+AM_INIT_AUTOMAKE([1.11.6 dist-bzip2 dist-xz color-tests serial-tests +-AM_INIT_AUTOMAKE([1.14 dist-bzip2 dist-xz color-tests parallel-tests ++AM_INIT_AUTOMAKE([1.14 dist-bzip2 dist-xz color-tests serial-tests silent-rules subdir-objects gnu]) AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. --- -2.7.4 -