Merge pull request #434 from fosslinux/m4

M4 alternative update
2024-02-07 22:11:58 +00:00 · 2024-02-07 22:11:58 +00:00 · 54068851d8
parent 61cb7edf91 6b4ec19e19
commit 54068851d8
10 changed files with 137 additions and 30 deletions
--- a/parts.rst
+++ b/parts.rst
@ -417,8 +417,8 @@ bzip2 1.0.8
 ``bzip2`` is rebuilt unpatched with the new tcc and musl fixing issues
 with reading files from stdin that existed in the previous build.

-m4 1.4.10
-=========
+m4 1.4.7
+========

 ``m4`` is the first piece of software we need in the autotools suite,
 flex 2.6.4 and bison. It allows macros to be defined and files to be
@ -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.
--- a/steps/SHA256SUMS.pkgs
+++ b/steps/SHA256SUMS.pkgs
@ -1,13 +1,13 @@
-b74448efbd2174ac7e9be469710a5a69e5218392ee6d81bd0837dc7a956626db  autoconf-2.52_0.tar.bz2
-97854afe32b6f79df6344d6e9cb8ebf1b011d87bda2a5b03716d602df6123e65  autoconf-2.53_0.tar.bz2
-22eb03cf83aed5234bb4242d412c7459ef83d3a490b0edf700eb04c66584c755  autoconf-2.54_0.tar.bz2
-639cf40f168ae7ca581e31ce956d6e640926fb8f7ccccc91ad7c84ce14bafff0  autoconf-2.55_0.tar.bz2
-229ac87bab8d6efaaeef6c2d7966c0326b048caef58f349add1b1ea759a75978  autoconf-2.57_0.tar.bz2
-cadbb48282d6ab4ad8e208e4714576a673221794afe4cf79df22c49abe08b867  autoconf-2.59_0.tar.bz2
-bc7628f88f4972bb6f5977ecdafe361b923eb1a7b3eaf98c3f21b49bf788d68a  autoconf-2.61_0.tar.bz2
-6f43e3a5b9ecaa7944b980da443450b71cc08dc382856ec1172c5be82486b8d3  autoconf-2.64_0.tar.bz2
-25eab7b767c44ba43373ed3f6015c3499ed168e21d2156538d0986b2b14cb7bb  autoconf-2.69_0.tar.bz2
-bc992209e05fdd9bf271a2705d5e4892f0212289f8edf4123813ec96e8bdc3e5  autoconf-2.71_0.tar.bz2
+2dac610769286171ca81e736d729f5227938596cf44a0a8a764009715c55d23b  autoconf-2.52_0.tar.bz2
+7345a49227ed69774e01097c514f1ebd3abaeed0b2b9136b7f5ee1b0fe573390  autoconf-2.53_0.tar.bz2
+22418f18b0dbf0476efb1823dcebdf70d7619113ca10076ba9b078ab3597a578  autoconf-2.54_0.tar.bz2
+8e74f93f12599f883ba62fe2bf4f69c70270ce368f71aa782f8f42a36a752d19  autoconf-2.55_0.tar.bz2
+1bd66ca8cc6300e192afe06cd90b1250f02ca64539a4f3e98a872333ec04f44b  autoconf-2.57_0.tar.bz2
+83235c739887f0d801e410e922553a6fd7723cbd0c9b2e96106e20538abb3a3b  autoconf-2.59_0.tar.bz2
+8912ae2a24ea40a7cd3ccab5e97dd109db7be4a86f40458ac836568aa7437b6a  autoconf-2.61_0.tar.bz2
+d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4  autoconf-2.64_0.tar.bz2
+298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b  autoconf-2.69_0.tar.bz2
+8c2401edf1c68910005bbcb8b8e84727a46f7d9643d2ad1267bd0259078dadc4  autoconf-2.71_0.tar.bz2
 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b  autoconf-archive-2021.02.19_0.tar.bz2
 439fc68ab7d0a9a46caca2c7cbefbdb6ffe906f927e07d150e102bb76b393c37  autogen-5.18.16_0.tar.bz2
 02a426e82a52d4a2cd7e73fe3dc5a2c58b3ed100f24a92c57e42511fd86e247c  automake-1.10.3_0.tar.bz2
@ -78,7 +78,8 @@ daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_
 503007bbcddcf4e49d26514c59b4c9501f8b42f0c994a59dfdc388b1ae6b7900  libunistring-0.9.10_0.tar.bz2
 576c04a4b2ccbfe6b48f5f16e8bd59469e359bdc77458ed82a4025da98ad6dcb  linux-4.9.10_0.tar.bz2
 d15c922973c15a8206e09020e8cfe6a78f7e93614de212f2b37ff80163799c6c  linux-headers-4.9.10_0.tar.bz2
-a1fb0cb2744e7442dbc106df69b84180b8544060a286006649a73b81613cdd24  m4-1.4.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
--- a/steps/m4-1.4.10/pass1.sh
+++ b/steps/m4-1.4.10/pass1.sh
@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-src_prepare() {
-    default
-
-    touch lib/configmake.h
-}
--- a/steps/m4-1.4.10/sources
+++ b/steps/m4-1.4.10/sources
@ -1 +0,0 @@
-https://mirrors.kernel.org/gnu/m4/m4-1.4.10.tar.gz 197fcb73c346fa669f143c3f0ec3144271f133647df00b2258bff1fd485cabe0
--- a/steps/m4-1.4.19/import-gnulib.sh
+++ 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
--- a/steps/m4-1.4.19/pass1.sh
+++ 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}"
+}
--- a/steps/m4-1.4.19/sources
+++ 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
--- a/steps/m4-1.4.10/mk/main.mk
+++ b/steps/m4-1.4.10/mk/main.mk
@ -7,9 +7,9 @@ CC      = tcc
 AR      = tcc -ar

 CFLAGS  = -I lib \
-          -DVERSION=\"1.4.10\" \
+          -DVERSION=\"1.4.7\" \
          -DPACKAGE_BUGREPORT=\"bug-m4@gnu.org\" \
-          -DPACKAGE_STRING=\"GNU\ M4\ 1.4.10\" \
+          -DPACKAGE_STRING=\"GNU\ M4\ 1.4.7\" \
          -DPACKAGE=\"m4\" \
          -DPACKAGE_NAME=\"GNU\ M4\" \
          -DHAVE_STDINT_H=1 \
@ -17,16 +17,14 @@ CFLAGS  = -I lib \
          -DHAVE_DECL___FPENDING=1 \
          -D_GNU_SOURCE=1 \
          -D_GL_UNUSED= \
-          -DGNULIB_CLOSE_STREAM=1 \
          -D__getopt_argv_const=const \
-          -DSYSCMD_SHELL=\"/bin/sh\" \
-          -DLIBDIR=\"$(PREFIX)/lib/i386-unknown-linux-musl\"
+          -DSYSCMD_SHELL=\"/bin/sh\"

 LDFLAGS = -L . -lm4

 .PHONY: all

-LIB_SRC = clean-temp cloexec close-stream closein closeout dup-safer error exitfail fatal-signal fd-safer fopen-safer getopt getopt1 gl_avltree_oset gl_linkedhash_list gl_list gl_oset localcharset mkstemp-safer regex obstack quotearg tmpdir verror version-etc version-etc-fsf xalloc-die xasprintf xmalloc xvasprintf
+LIB_SRC = cloexec close-stream dup-safer error exitfail fd-safer fopen-safer getopt getopt1 mkstemp-safer regex obstack tmpfile-safer verror xalloc-die xasprintf xmalloc xvasprintf
 LIB_OBJECTS = $(addprefix lib/, $(addsuffix .o, $(LIB_SRC)))

 M4_SRC = m4 builtin debug eval format freeze input macro output path symtab
--- a/steps/m4-1.4.7/sources
+++ b/steps/m4-1.4.7/sources
@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/m4/m4-1.4.7.tar.gz 093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303
--- a/steps/manifest
+++ b/steps/manifest
@ -66,7 +66,7 @@ build: musl-1.1.24
 build: tcc-0.9.27
 build: sed-4.0.9
 build: bzip2-1.0.8
-build: m4-1.4.10
+build: m4-1.4.7
 build: flex-2.6.4
 uninstall: /usr/bin/yacc
 build: bison-3.4.1
@ -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 )
				`@ -1 +0,0 @@`
				`https://mirrors.kernel.org/gnu/m4/m4-1.4.10.tar.gz 197fcb73c346fa669f143c3f0ec3144271f133647df00b2258bff1fd485cabe0`
				`@ -0,0 +1 @@`
				`https://mirrors.kernel.org/gnu/m4/m4-1.4.7.tar.gz 093c993767f563a11e41c1cf887f4e9065247129679d4c1e213d0544d16d8303`