diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index a9a4bc2..d5459be 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -7,6 +7,7 @@ f757158a04889b265203eecd8ca92568e2a67c3b9062fa6bff7a0a6efd2244ac autoconf-2.55. e1035aa2c21fae2a934d1ab56c774ce9d22717881dab8a1a5b16d294fb793489 autoconf-2.57.tar.bz2 f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7 autoconf-2.59.tar.bz2 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1 autoconf-2.61.tar.bz2 +e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc automake-1.10.3.tar.bz2 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f automake-1.4-p6.tar.gz 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81 automake-1.6.3.tar.bz2 2dddc3b51506e702647ccc6757e15c05323fa67245d2d53e81ed36a832f9be42 automake-1.7.8.tar.bz2 diff --git a/parts.rst b/parts.rst index ee510c0..5122a56 100644 --- a/parts.rst +++ b/parts.rst @@ -515,6 +515,12 @@ libtool 2.2.4 Newer version of libtool which is more compatible with modern Autotools. +automake 1.10.3 +=============== + +GNU Automake from 1.10 series. ``aclocal`` is slightly patched to work +with our ``perl``. + gcc 4.0.4 ========= @@ -544,3 +550,16 @@ interactively. This new version of ``bash`` compiles without any patches, provides new features, and is built with GNU readline support so it can be used as an interactive shell. ``autoconf-2.61`` is used to regenerate the configure script and ``bison`` is used to recreate some included generated files. + +autoconf 2.65 +============= + +Slightly newer version of GNU Autoconf. At this stage Autoconf is mostly +backwards compatible but newer versions need newer ``automake``. + +xz 5.0.5 +======== + +XZ Utils is a set of free software command-line lossless data compressors, +including lzma and xz. In most cases, xz achieves higher compression rates +than alternatives like gzip and bzip2. diff --git a/rootfs.sh b/rootfs.sh index 647a35d..a7988f0 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -273,6 +273,9 @@ get_file https://ftp.gnu.org/gnu/findutils/findutils-4.2.33.tar.gz # libtool 2.2.4 get_file https://ftp.gnu.org/gnu/libtool/libtool-2.2.4.tar.bz2 +# automake 1.10.3 +get_file https://ftp.gnu.org/gnu/automake/automake-1.10.3.tar.bz2 + # General cleanup find tmp -name .git -exec rm -rf \; diff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/sysa/automake-1.10.3/automake-1.10.3.sh new file mode 100755 index 0000000..2954a50 --- /dev/null +++ b/sysa/automake-1.10.3/automake-1.10.3.sh @@ -0,0 +1,21 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default_src_prepare + + autoreconf-2.61 -f +} + +src_configure() { + ./configure CC=tcc --prefix=/after +} + +src_compile() { + make MAKEINFO=true +} + +src_install() { + make install MAKEINFO=true +} diff --git a/sysa/automake-1.10.3/patches/aclocal_glob.patch b/sysa/automake-1.10.3/patches/aclocal_glob.patch new file mode 100644 index 0000000..1e0bd5f --- /dev/null +++ b/sysa/automake-1.10.3/patches/aclocal_glob.patch @@ -0,0 +1,16 @@ +SPDX-FileCopyrightText: 2021 Andrius Štikonas + +SPDX-License-Identifier: GPL-2.0-or-later + +Fixes aclocal-1.10 to work with our Perl + +--- aclocal.in 2021-03-25 19:18:10.489134059 +0000 ++++ aclocal.in 2021-03-25 19:18:20.159389339 +0000 +@@ -45,6 +45,7 @@ + use Automake::FileUtils; + use File::Basename; + use File::stat; ++use File::Glob; + use Cwd; + + # Some globals. diff --git a/sysa/run.sh b/sysa/run.sh index 90d3771..8ae4f57 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -130,6 +130,8 @@ build findutils-4.2.33 build libtool-2.2.4 +build automake-1.10.3 + build gcc-4.0.4 pass1.sh checksums/pass1 build musl-1.2.2 diff --git a/sysa/run2.sh b/sysa/run2.sh index b63c38a..cb2a32a 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -10,6 +10,10 @@ set -e . helpers.sh +build autoconf-2.65 + +build xz-5.0.5 + echo "Bootstrapping completed." exec env - PATH=/after/bin PS1="\w # " bash -i