From 6b4ec19e19442e3cd62e06f6558a8c8c75d8a7ce Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Tue, 6 Feb 2024 17:44:32 +1100
Subject: [PATCH] Add m4 1.4.19

---
 parts.rst                        |  7 +++
 steps/SHA256SUMS.pkgs            |  1 +
 steps/m4-1.4.19/import-gnulib.sh | 87 ++++++++++++++++++++++++++++++++
 steps/m4-1.4.19/pass1.sh         | 20 ++++++++
 steps/m4-1.4.19/sources          |  2 +
 steps/manifest                   |  1 +
 6 files changed, 118 insertions(+)
 create mode 100644 steps/m4-1.4.19/import-gnulib.sh
 create mode 100644 steps/m4-1.4.19/pass1.sh
 create mode 100644 steps/m4-1.4.19/sources

diff --git a/parts.rst b/parts.rst
index d518ba7..7ed3db0 100644
--- a/parts.rst
+++ b/parts.rst
@@ -1274,3 +1274,10 @@ gawk 5.3.0
 Similarly to diffutils, our gawk is currently very ancient (1999). That doesn't
 cut it for modern software such as glibc. We update gawk to a much more modern
 version.
+
+m4 1.4.19
+=========
+
+We are in need of a newer version of m4 for some modern software. Attempts to
+update m4 1.4.7 earlier in the bootstrap demonstrate some issues with Fiwix,
+so we build a newer m4 at the end of the bootstrap instead.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
index 413a1aa..b9efd18 100644
--- a/steps/SHA256SUMS.pkgs
+++ b/steps/SHA256SUMS.pkgs
@@ -79,6 +79,7 @@ daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_
 576c04a4b2ccbfe6b48f5f16e8bd59469e359bdc77458ed82a4025da98ad6dcb  linux-4.9.10_0.tar.bz2
 d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c  linux-headers-4.9.10_0.tar.bz2
 bd3885a389d3e058081e099850f95aa7938ce1d9b88a187aea6b7196124fbcfe  m4-1.4.7_0.tar.bz2
+78b0cf6d9312e53c613186cbddd5f747310f375c1f322f33a6ac33682d2f3389  m4-1.4.19_0.tar.bz2
 e69554b0a77b419ddd5d0a0e418ba4005ecd0f6784c92a6928a0270bd929a098  make-3.82_0.tar.bz2
 6d24960d6a987f68a7e0e3abf6edb52d2e0fe4c86f6ba45327e9634dbf7d40b4  make-4.2.1_0.tar.bz2
 17cd976bc0f6e897c6fffe43dd7c55d93ce0adadf1b4dc72925b80e2d266519f  mpc-1.2.1_0.tar.bz2
diff --git a/steps/m4-1.4.19/import-gnulib.sh b/steps/m4-1.4.19/import-gnulib.sh
new file mode 100644
index 0000000..203c756
--- /dev/null
+++ b/steps/m4-1.4.19/import-gnulib.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+../gnulib-3639c57/gnulib-tool --import --local-dir=gl \
+ --lib=libm4 \
+ --source-base=lib \
+ --m4-base=m4 \
+ --doc-base=doc \
+ --tests-base=tests \
+ --aux-dir=build-aux \
+ --with-tests \
+ --with-c++-tests \
+ --makefile-name=gnulib.mk \
+ --no-conditional-dependencies \
+ --no-libtool \
+ --macro-prefix=M4 \
+ --avoid=getopt-posix-tests \
+ --avoid=lock-tests \
+ --avoid=tls-tests \
+ announce-gen \
+ assert \
+ attribute \
+ autobuild \
+ avltree-oset \
+ binary-io \
+ c-ctype \
+ c-stack \
+ clean-temp \
+ close-stream \
+ closein \
+ config-h \
+ configmake \
+ dirname \
+ do-release-commit-and-tag \
+ error \
+ execute \
+ fclose \
+ fdl-1.3 \
+ fflush \
+ filenamecat \
+ fopen-gnu \
+ fopen-safer \
+ fseeko \
+ gendocs \
+ getopt-gnu \
+ gettext-h \
+ git-version-gen \
+ gitlog-to-changelog \
+ gnu-web-doc-update \
+ gnumakefile \
+ gnupload \
+ gpl-3.0 \
+ ignore-value \
+ intprops \
+ maintainer-makefile \
+ manywarnings \
+ memchr2 \
+ mkstemp \
+ obstack \
+ progname \
+ propername \
+ regex \
+ rename \
+ setlocale \
+ sigaction \
+ sigpipe \
+ spawn-pipe \
+ stdbool \
+ stdint \
+ stdlib-safer \
+ strsignal \
+ strstr \
+ strtod \
+ unlocked-io \
+ update-copyright \
+ vc-list-files \
+ verify \
+ verror \
+ version-etc \
+ version-etc-fsf \
+ wait-process \
+ xalloc \
+ xoset \
+ xprintf \
+ xvasprintf-posix
diff --git a/steps/m4-1.4.19/pass1.sh b/steps/m4-1.4.19/pass1.sh
new file mode 100644
index 0000000..b1f6820
--- /dev/null
+++ b/steps/m4-1.4.19/pass1.sh
@@ -0,0 +1,20 @@
+# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    . ../../import-gnulib.sh
+
+    rm doc/*.1
+
+    rm lib/iconv_open*.h
+
+    autoreconf-2.71 -fi
+}
+
+src_configure() {
+    LDFLAGS="-latomic" \
+        ./configure \
+        --prefix="${PREFIX}" \
+        --libdir="${LIBDIR}"
+}
diff --git a/steps/m4-1.4.19/sources b/steps/m4-1.4.19/sources
new file mode 100644
index 0000000..591b630
--- /dev/null
+++ b/steps/m4-1.4.19/sources
@@ -0,0 +1,2 @@
+https://mirrors.kernel.org/gnu/m4/m4-1.4.19.tar.xz 63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
+http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-3639c57.tar.gz 97dfbad67832641bc7f73437617b78abeafb9946723f19cf4c2ceecfc65fa48d
diff --git a/steps/manifest b/steps/manifest
index e39fc41..c5ca560 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -203,6 +203,7 @@ build: opendoas-6.8.2
 build: gzip-1.13
 build: diffutils-3.10
 build: gawk-5.3.0
+build: m4-1.4.19
 improve: cleanup_filesystem
 improve: null_time ( FORCE_TIMESTAMPS == True )
 improve: update_checksums ( UPDATE_CHECKSUMS == True )