From dd77379dbd129b99796d0089296fccef811e332d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Thu, 1 Apr 2021 00:28:30 +0100
Subject: [PATCH] GNU Automake 1.15.1

---
 SHA256SUMS.sources                            |  1 +
 parts.rst                                     |  5 +++++
 rootfs.sh                                     |  3 +++
 sysa/automake-1.15.1/automake-1.15.1.sh       | 21 +++++++++++++++++++
 .../patches/aclocal_glob.patch                | 16 ++++++++++++++
 sysa/automake-1.15.1/patches/bootstrap.patch  | 17 +++++++++++++++
 sysa/run2.sh                                  |  2 ++
 7 files changed, 65 insertions(+)
 create mode 100755 sysa/automake-1.15.1/automake-1.15.1.sh
 create mode 100644 sysa/automake-1.15.1/patches/aclocal_glob.patch
 create mode 100644 sysa/automake-1.15.1/patches/bootstrap.patch

diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources
index 8f9b0e1..56ab69f 100644
--- a/SHA256SUMS.sources
+++ b/SHA256SUMS.sources
@@ -13,6 +13,7 @@ e98ab43bb839c31696a4202e5b6ff388b391659ef2387cf9365019fad17e1adc  automake-1.10.
 4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718  automake-1.11.2.tar.bz2
 f834ab2145b1ee24bd85387950044f5cb418dd0af2b84c52e60c2bf29162dbfa  automake-1.12.6.tar.xz
 89ce4933f59b8f0c20115c39cfe450a595cca74ede27b6881e88ec27720d1d66  automake-1.13.4.tar.xz
+af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf  automake-1.15.1.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 5a556d7..0c0d513 100644
--- a/parts.rst
+++ b/parts.rst
@@ -589,3 +589,8 @@ automake 1.13.4
 ===============
 
 GNU Automake from 1.13 series.
+
+automake 1.15.1
+===============
+
+GNU Automake from 1.15 series. This is the last version that runs on Perl 5.6.
diff --git a/rootfs.sh b/rootfs.sh
index 4136e5b..a5f070e 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -294,6 +294,9 @@ get_file https://ftp.gnu.org/gnu/automake/automake-1.12.6.tar.xz
 # automake 1.13.4
 get_file https://ftp.gnu.org/gnu/automake/automake-1.13.4.tar.xz
 
+# automake 1.15.1
+get_file https://ftp.gnu.org/gnu/automake/automake-1.15.1.tar.xz
+
 # General cleanup
 find tmp -name .git -exec rm -rf \;
 
diff --git a/sysa/automake-1.15.1/automake-1.15.1.sh b/sysa/automake-1.15.1/automake-1.15.1.sh
new file mode 100755
index 0000000..2793cf2
--- /dev/null
+++ b/sysa/automake-1.15.1/automake-1.15.1.sh
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    default_src_prepare
+
+    ./bootstrap
+}
+
+src_configure() {
+    ./configure --prefix=/after
+}
+
+src_compile() {
+    make MAKEINFO=true CC=tcc
+}
+
+src_install() {
+    make install MAKEINFO=true
+}
diff --git a/sysa/automake-1.15.1/patches/aclocal_glob.patch b/sysa/automake-1.15.1/patches/aclocal_glob.patch
new file mode 100644
index 0000000..d88394f
--- /dev/null
+++ b/sysa/automake-1.15.1/patches/aclocal_glob.patch
@@ -0,0 +1,16 @@
+SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Fixes aclocal to work with our Perl
+
+--- bin/aclocal.in  2021-03-31 18:19:50.665806225 +0100
++++ bin/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/automake-1.15.1/patches/bootstrap.patch b/sysa/automake-1.15.1/patches/bootstrap.patch
new file mode 100644
index 0000000..5707076
--- /dev/null
+++ b/sysa/automake-1.15.1/patches/bootstrap.patch
@@ -0,0 +1,17 @@
+SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+
+SPDX-License-Identifier: GPL-2.0-or-later
+
+Fixes dependency of bootstrapping script
+
+--- gen-testsuite-part  2017-06-16 21:46:16.000000000 +0100
++++ gen-testsuite-part  2021-04-01 00:02:46.801098617 +0100
+@@ -64,8 +64,6 @@
+   $func->($fh);
+   close $fh
+     or die "$me: closing '$tmpfile': $!\n";
+-  chmod ($perms & ~umask, $tmpfile)
+-    or die "$me: cannot change perms for '$tmpfile': $!\n";
+   rename ($tmpfile, $outfile)
+     or die "$me: renaming '$tmpfile' -> '$outfile: $!\n'";
+ }
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 8264861..90eed78 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -20,6 +20,8 @@ build automake-1.12.6
 
 build automake-1.13.4
 
+build automake-1.15.1
+
 echo "Bootstrapping completed."
 
 exec env - PATH=/after/bin PS1="\w # " bash -i