From 56920329968214748cd78f0621830ab1be100fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 31 Mar 2021 18:21:07 +0100 Subject: [PATCH] GNU Automake 1.12.6 --- SHA256SUMS.sources | 1 + parts.rst | 5 +++++ rootfs.sh | 3 +++ sysa/automake-1.12.6/automake-1.12.6.sh | 21 +++++++++++++++++++ .../patches/aclocal_glob.patch | 16 ++++++++++++++ sysa/run2.sh | 2 ++ 6 files changed, 48 insertions(+) create mode 100755 sysa/automake-1.12.6/automake-1.12.6.sh create mode 100644 sysa/automake-1.12.6/patches/aclocal_glob.patch diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index a7f6b09..9075fcb 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -11,6 +11,7 @@ db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b autoconf-2.65. 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 autoconf-2.69.tar.xz e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc automake-1.10.3.tar.bz2 4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718 automake-1.11.2.tar.bz2 +f834ab2145b1ee24bd85387950044f5cb418dd0af2b84c52e60c2bf29162dbfa automake-1.12.6.tar.xz 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 ede7e6b..a078a05 100644 --- a/parts.rst +++ b/parts.rst @@ -579,3 +579,8 @@ autoconf 2.69 This the final version of GNU Autoconf that we will require. There are some newer versions but we won't need them. + +automake 1.12.6 +=============== + +GNU Automake from 1.12 series. diff --git a/rootfs.sh b/rootfs.sh index dca1aeb..a1b3060 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -288,6 +288,9 @@ get_file https://ftp.gnu.org/gnu/automake/automake-1.11.2.tar.bz2 # autoconf 2.69 get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz +# automake 1.12.6 +get_file https://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz + # General cleanup find tmp -name .git -exec rm -rf \; diff --git a/sysa/automake-1.12.6/automake-1.12.6.sh b/sysa/automake-1.12.6/automake-1.12.6.sh new file mode 100755 index 0000000..1175c72 --- /dev/null +++ b/sysa/automake-1.12.6/automake-1.12.6.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.69 -f +} + +src_configure() { + ./configure --prefix=/after +} + +src_compile() { + make MAKEINFO=true CC=tcc +} + +src_install() { + make install MAKEINFO=true +} diff --git a/sysa/automake-1.12.6/patches/aclocal_glob.patch b/sysa/automake-1.12.6/patches/aclocal_glob.patch new file mode 100644 index 0000000..4d348c3 --- /dev/null +++ b/sysa/automake-1.12.6/patches/aclocal_glob.patch @@ -0,0 +1,16 @@ +SPDX-FileCopyrightText: 2021 Andrius Štikonas + +SPDX-License-Identifier: GPL-2.0-or-later + +Fixes aclocal to work with our Perl + +--- aclocal.in 2021-03-31 18:19:50.665806225 +0100 ++++ aclocal.in 2021-03-31 18:20:02.836132739 +0100 +@@ -42,6 +42,7 @@ + use Automake::XFile; + use Automake::FileUtils; + use File::Basename; ++use File::Glob; + use File::Path (); + + # Some globals. diff --git a/sysa/run2.sh b/sysa/run2.sh index 522f6c8..f3f957b 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -16,6 +16,8 @@ build automake-1.11.2 build autoconf-2.69 +build automake-1.12.6 + echo "Bootstrapping completed." exec env - PATH=/after/bin PS1="\w # " bash -i