From 838a1bfb904561f01a94cdfe5150c3daef9c28ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 28 Mar 2021 23:18:33 +0100 Subject: [PATCH] GNU Automake 1.11.2. --- SHA256SUMS.sources | 1 + parts.rst | 6 ++++++ rootfs.sh | 3 +++ sysa/automake-1.11.2/automake-1.11.2.sh | 21 +++++++++++++++++++ .../patches/aclocal_glob.patch | 16 ++++++++++++++ sysa/gcc-4.0.4/pass1.sh | 2 +- sysa/gcc-4.0.4/pass2.sh | 2 +- sysa/run2.sh | 2 ++ 8 files changed, 51 insertions(+), 2 deletions(-) create mode 100755 sysa/automake-1.11.2/automake-1.11.2.sh create mode 100644 sysa/automake-1.11.2/patches/aclocal_glob.patch diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index 9f9c1a6d..6c93a3d6 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -9,6 +9,7 @@ f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7 autoconf-2.59. 93a2ceab963618b021db153f0c881a2de82455c1dc7422be436fcd5c554085a1 autoconf-2.61.tar.bz2 db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b autoconf-2.65.tar.bz2 e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc automake-1.10.3.tar.bz2 +4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718 automake-1.11.2.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 d59eae82..ce1757f3 100644 --- a/parts.rst +++ b/parts.rst @@ -567,3 +567,9 @@ 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. + +automake 1.11.2 +=============== + +GNU Automake from 1.11 series. This is not the latest point release as newer ones +need Autoconf 2.68. diff --git a/rootfs.sh b/rootfs.sh index 9046bc09..a56e827c 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -282,6 +282,9 @@ get_file https://ftp.gnu.org/gnu/bash/bash-5.1.tar.gz # xz 5.0.5 get_file https://tukaani.org/xz/xz-5.0.5.tar.bz2 +# automake 1.11.2 +get_file https://ftp.gnu.org/gnu/automake/automake-1.11.2.tar.bz2 + # General cleanup find tmp -name .git -exec rm -rf \; diff --git a/sysa/automake-1.11.2/automake-1.11.2.sh b/sysa/automake-1.11.2/automake-1.11.2.sh new file mode 100755 index 00000000..94cac796 --- /dev/null +++ b/sysa/automake-1.11.2/automake-1.11.2.sh @@ -0,0 +1,21 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default_src_prepare + + ./bootstrap +} + +src_configure() { + ./configure --prefix=/after +} + +src_compile() { + make MAKEINFO=true +} + +src_install() { + make install MAKEINFO=true +} diff --git a/sysa/automake-1.11.2/patches/aclocal_glob.patch b/sysa/automake-1.11.2/patches/aclocal_glob.patch new file mode 100644 index 00000000..1e0bd5fa --- /dev/null +++ b/sysa/automake-1.11.2/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/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh index d107a7cf..4a67e469 100755 --- a/sysa/gcc-4.0.4/pass1.sh +++ b/sysa/gcc-4.0.4/pass1.sh @@ -31,7 +31,7 @@ src_prepare() { cd .. done cd libmudflap - AUTOM4TE=autom4te-2.61 autoreconf-2.61 -f + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.61 autoreconf-2.61 -f cd .. for dir in fixincludes intl libmudflap; do diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh index 9414cb39..f2d65b96 100755 --- a/sysa/gcc-4.0.4/pass2.sh +++ b/sysa/gcc-4.0.4/pass2.sh @@ -30,7 +30,7 @@ src_prepare() { cd .. done cd libmudflap - AUTOM4TE=autom4te-2.61 autoreconf-2.61 -f + AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.61 autoreconf-2.61 -f cd .. for dir in fixincludes intl libmudflap; do diff --git a/sysa/run2.sh b/sysa/run2.sh index e2efec21..398759d0 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -12,6 +12,8 @@ set -e build xz-5.0.5 +build automake-1.11.2 + echo "Bootstrapping completed." exec env - PATH=/after/bin PS1="\w # " bash -i