Automake 1.7 and Autoconf 2.54

SHA256SUMS.sources

@@ -2,8 +2,10 @@
 f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e  autoconf-2.13.tar.gz
 4681bcbb9c9298c506f6405a7deb62c54fc3b339d3239a8f36a5df83daaec94f  autoconf-2.52.tar.bz2
 6b217a064c6d06603d50a3ad05129aef9435367810c10894210b8dad965d2306  autoconf-2.53.tar.bz2
+a74aea954f36c7beeb6cc47b96a408c3e04e7ad635f614e65250dbcd8ec0bd28  autoconf-2.54.tar.bz2
 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f  automake-1.4-p6.tar.gz
 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81  automake-1.6.3.tar.bz2
+6633ee1202375e3c8798a92e1b7f46894f78d541aeea7f49654503fdc0b28835  automake-1.7.tar.bz2
 ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4  bash-2.05b.tar.gz
 3fa9daf85ebf35068f090ce51283ddeeb3c75eb5bc70b1a4a7cb05868bfe06a4  bash-3.2.57.tar.gz
 e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59  binutils-2.14.tar.bz2

parts.rst

@@ -446,6 +446,22 @@ We now start bootstrapping newer versions of autoconf. Version 2.53 now uses ``p
 In order to build it with ``autoconf-2.52`` we have to patch it a bit and then do
 a second unpatched build with newly built ``autoconf-2.53``.
 
+automake 1.7
+============
+
+Automake 1.7 and Autoconf 2.54 depend on each other, so we patch out two offending
+autoconf macros to make it build with ``autoconf-2.53``.
+
+autoconf 2.54
+=============
+
+More ``autoconf``.
+
+automake 1.7
+============
+
+Rebuild ``automake`` with ``autoconf-2.54``.
+
 bash 3.2.57
 ===========
 

rootfs.sh

@@ -228,6 +228,12 @@ get_file https://ftp.gnu.org/gnu/binutils/binutils-2.14.tar.bz2
 # autoconf 2.53
 get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.53.tar.bz2
 
+# automake 1.7
+get_file https://ftp.gnu.org/gnu/automake/automake-1.7.tar.bz2
+
+# autoconf 2.54
+get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.54.tar.bz2
+
 # bash 3.2.57
 get_file https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz
 

sysa/autoconf-2.54/stage1.sh

@@ -0,0 +1,30 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+    aclocal-1.7
+    sed -i 's/2.54/2.53/' aclocal.m4
+    cat config/m4.m4 >> aclocal.m4
+    autoconf-2.53
+
+    # Otherwise automake-1.7 fails to find autoconf
+    ln -s "${PREFIX}"/bin/autoconf-2.53 "${PREFIX}"/bin/autoconf
+    automake-1.7
+
+    # Install autoconf data files into versioned directory
+    for file in */*/Makefile.in */Makefile.in Makefile.in; do
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+    done
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" --program-suffix=-2.54
+}
+
+src_install() {
+    default_src_install
+
+    ln -sf "${PREFIX}"/bin/autoconf-2.54 "${PREFIX}"/bin/autoconf
+}

sysa/autoconf-2.54/stage2.sh

@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
+
+    autoreconf-2.54
+
+    # Install autoconf data files into versioned directory
+    for file in */*/Makefile.in */Makefile.in Makefile.in; do
+        sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file
+    done
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" --program-suffix=-2.54
+}

sysa/automake-1.7/stage1.sh

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4
+    sed -i -e 's/2.54/2.53/' -e '/AC_PROG_EGREP/d' -e '/AC_PROG_FGREP/d' configure.in
+    aclocal-1.6
+    autoconf-2.53
+    automake-1.6
+}
+
+src_configure() {
+    ./configure --prefix=/after
+}

sysa/automake-1.7/stage2.sh

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4
+
+    autoreconf-2.54
+}
+
+src_configure() {
+    ./configure --prefix=/after
+}

sysa/run.sh

@@ -104,6 +104,13 @@ build tcc-0.9.27 tcc-musl-pass3.sh checksums/tcc-musl-pass3
 build autoconf-2.53 stage1.sh
 build autoconf-2.53 stage2.sh
 
+build automake-1.7 stage1.sh
+
+build autoconf-2.54 stage1.sh
+build autoconf-2.54 stage2.sh
+
+build automake-1.7 stage2.sh
+
 build bash-3.2.57
 
 exec bash run2.sh