From 9fb1287f13dd61f7ffd5b71e0c4c51e831eeb902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 15 Mar 2021 23:50:26 +0000 Subject: [PATCH] Replace automake 1.5 with automake 1.6.3 --- SHA256SUMS.sources | 2 +- parts.rst | 13 +++-- rootfs.sh | 4 +- sysa/automake-1.5/patches/automake-1.4.patch | 60 -------------------- sysa/automake-1.5/stage1.sh | 25 -------- sysa/automake-1.5/stage2.sh | 27 --------- sysa/automake-1.6.3/stage1.sh | 31 ++++++++++ sysa/automake-1.6.3/stage2.sh | 24 ++++++++ sysa/run2.sh | 4 +- 9 files changed, 67 insertions(+), 123 deletions(-) delete mode 100644 sysa/automake-1.5/patches/automake-1.4.patch delete mode 100755 sysa/automake-1.5/stage1.sh delete mode 100755 sysa/automake-1.5/stage2.sh create mode 100755 sysa/automake-1.6.3/stage1.sh create mode 100755 sysa/automake-1.6.3/stage2.sh diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index 3b8dbc0f..b64b7869 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -2,7 +2,7 @@ f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e autoconf-2.13.tar.gz 534e99b61b81e79327b6d08f1a3edb0755ac246e1249009b0e1bf5887b60d7a9 autoconf-2.52.tar.gz 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f automake-1.4-p6.tar.gz -24b4775e3143fd3e35db5cbaba80845d9359c7bfd751a6cebe3014fbf6115d78 automake-1.5.tar.gz +0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81 automake-1.6.3.tar.bz2 ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4 bash-2.05b.tar.gz 3fa9daf85ebf35068f090ce51283ddeeb3c75eb5bc70b1a4a7cb05868bfe06a4 bash-3.2.57.tar.gz e20bdd49a0fb317959b410c1fe81269a620ec21207045d8a37cadea621be4b59 binutils-2.14.tar.bz2 diff --git a/parts.rst b/parts.rst index 3879f3be..a8836f7d 100644 --- a/parts.rst +++ b/parts.rst @@ -103,8 +103,7 @@ tar 1.12 GNU ``tar`` is the most common archive format used by software source code, often compressed also. To avoid continuing using submodules, we -build GNU tar 1.12, the last version compilable by tinycc without -significant patching. +build GNU tar 1.12, the last version compilable with mes libc. gzip 1.2.4 ========== @@ -440,8 +439,10 @@ provides new features, and is built with GNU readline support so it can be used as an interactive shell. autoconf 2.52 is used to regenerate the configure script and bison is used to recreate some included generated files. -automake 1.5 -============ +automake 1.6.3 +============== -We build a newer version of GNU Automake. We first build a slightly patched -version with ``automake-1.4`` and then use it to rebuild ``automake 1.5``. +This is a newer version of GNU Automake that is required to build newer +versions of ``autoconf``. We again use two stage approach like we did +with ``automake-1.4`` because previous versions of ``automake`` are too old +to properly build ``automake-1.6``. diff --git a/rootfs.sh b/rootfs.sh index 347401e5..0d6f69b0 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -228,8 +228,8 @@ get_file https://ftp.gnu.org/gnu/binutils/binutils-2.14.tar.bz2 # bash 3.2.57 get_file https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz -# automake 1.5 -get_file https://ftp.gnu.org/gnu/automake/automake-1.5.tar.gz +# automake 1.6.3 +get_file https://ftp.gnu.org/gnu/automake/automake-1.6.3.tar.bz2 # General cleanup find tmp -name .git -exec rm -rf \; diff --git a/sysa/automake-1.5/patches/automake-1.4.patch b/sysa/automake-1.5/patches/automake-1.4.patch deleted file mode 100644 index 38070891..00000000 --- a/sysa/automake-1.5/patches/automake-1.4.patch +++ /dev/null @@ -1,60 +0,0 @@ -SPDX-FileCopyrightText: 2021 Andrius Štikonas - -SPDX-License-Identifier: GPL-2.0-or-later - -Remove parts that automake 1.4 does not understand. -This breaks installation but builds a functional automake 1.5 -that can then rebuild itself. - -diff -U3 -r automake-1.5.orig/lib/am/Makefile.am automake-1.5/lib/am/Makefile.am ---- lib/am/Makefile.am 2001-05-14 05:48:45.000000000 +0100 -+++ lib/am/Makefile.am 2021-03-14 00:34:52.204432782 +0000 -@@ -2,10 +2,4 @@ - - amdir = $(pkgdatadir)/am - --dist_am_DATA = ansi2knr.am check.am clean-hdr.am clean.am compile.am \ --configure.am data.am dejagnu.am depend.am depend2.am distdir.am \ --footer.am header-vars.am header.am install.am java.am lang-compile.am \ --lex.am library.am libs.am libtool.am lisp.am ltlib.am ltlibrary.am \ --mans-vars.am mans.am multilib.am program.am progs.am python.am \ --remake-hdr.am scripts.am subdirs.am tags.am texi-vers.am texibuild.am \ --texinfos.am yacc.am -+ -diff -U3 -r automake-1.5.orig/lib/Automake/Makefile.am automake-1.5/lib/Automake/Makefile.am ---- lib/Automake/Makefile.am 2001-05-03 09:32:37.000000000 +0100 -+++ lib/Automake/Makefile.am 2021-03-14 00:35:01.164658975 +0000 -@@ -1,4 +1,3 @@ - ## Process this file with automake to create Makefile.in - - perllibdir = $(pkgdatadir)/Automake --dist_perllib_DATA = Struct.pm -diff -U3 -r automake-1.5.orig/lib/Makefile.am automake-1.5/lib/Makefile.am ---- lib/Makefile.am 2001-05-14 05:48:45.000000000 +0100 -+++ lib/Makefile.am 2021-03-14 00:34:38.234080302 +0000 -@@ -2,14 +2,10 @@ - - SUBDIRS = Automake am - --dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 -- - ## These must all be executable when installed. However, if we use - ## _SCRIPTS, then the program transform will be applied, which is not - ## what we want. So we make them executable by hand. - scriptdir = $(pkgdatadir) --dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \ --mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile - - install-data-hook: - @$(POST_INSTALL) -diff -U3 -r automake-1.5.orig/Makefile.am automake-1.5/Makefile.am ---- Makefile.am 2001-06-09 01:34:28.000000000 +0100 -+++ Makefile.am 2021-03-14 00:33:52.742934180 +0000 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in - --AUTOMAKE_OPTIONS = 1.4 dist-bzip2 -+AUTOMAKE_OPTIONS = 1.4 - - ## We need `.' in SUBDIRS because we want `check' to build `.' before - ## tests. diff --git a/sysa/automake-1.5/stage1.sh b/sysa/automake-1.5/stage1.sh deleted file mode 100755 index e7ad3129..00000000 --- a/sysa/automake-1.5/stage1.sh +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default_src_prepare - - rm configure Makefile.in */Makefile.in */*/Makefile.in - autoconf-2.52 - - aclocal-1.4 - automake-1.4 -} - -src_configure() { - ./configure --prefix=/after -} - -src_install() { - install automake "${PREFIX}/bin/automake-1.5" - mkdir -p "${PREFIX}/share/automake/Automake" - install -m644 lib/Automake/Struct.pm "${PREFIX}/share/automake/Automake/" - mkdir -p "${PREFIX}/share/automake/am" - cp lib/am/*.am "${PREFIX}/share/automake/am/" -} diff --git a/sysa/automake-1.5/stage2.sh b/sysa/automake-1.5/stage2.sh deleted file mode 100755 index 3d28bf47..00000000 --- a/sysa/automake-1.5/stage2.sh +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm configure Makefile.in */Makefile.in */*/Makefile.in - - autoconf-2.52 - - sed -i 's#$(datadir)/aclocal#$(datadir)/aclocal-1.5#' m4/Makefile.am - aclocal-1.4 - automake-1.5 - - sed -i 's#@datadir@/@PACKAGE@#@datadir@/@PACKAGE@-@VERSION@#' automake.in - for file in Makefile.in */Makefile.in */*/Makefile.in; do - sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file - done -} - -src_configure() { - ./configure --prefix=/after --program-suffix=-1.5 -} - -src_install() { - rm -rf "${PREFIX}/share/automake" - default_src_install -} diff --git a/sysa/automake-1.6.3/stage1.sh b/sysa/automake-1.6.3/stage1.sh new file mode 100755 index 00000000..0a04c719 --- /dev/null +++ b/sysa/automake-1.6.3/stage1.sh @@ -0,0 +1,31 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + sed -i '/Makefile/d' configure.in + + rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 + autoconf-2.52 +} + +src_configure() { + ./configure --prefix=/after +} + +src_compile() { + cp m4/amversion.in m4/amversion.m4 + sed -i 's/@VERSION@/1.6.3/' m4/amversion.m4 + sed -i 's/@APIVERSION@/1.6/' m4/amversion.m4 +} + +src_install() { + install automake "${PREFIX}"/bin/automake-1.6 + mkdir -p "${PREFIX}"/share/automake-1.6/{Automake,am} + cp lib/Automake/*.pm "${PREFIX}"/share/automake-1.6/Automake/ + cp -r lib/am/*.am "${PREFIX}"/share/automake-1.6/am/ + + install aclocal "${PREFIX}"/bin/aclocal-1.6 + mkdir -p "${PREFIX}"/share/aclocal-1.6 + cp -r m4/*.m4 "${PREFIX}"/share/aclocal-1.6/ +} diff --git a/sysa/automake-1.6.3/stage2.sh b/sysa/automake-1.6.3/stage2.sh new file mode 100755 index 00000000..02caaeec --- /dev/null +++ b/sysa/automake-1.6.3/stage2.sh @@ -0,0 +1,24 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + rm configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 + aclocal-1.6 + autoconf-2.52 + automake-1.6 +} + +src_configure() { + ./configure --prefix=/after +} + +src_install() { + # cleanup old manual install + rm "${PREFIX}"/bin/automake-1.6 + rm "${PREFIX}"/bin/aclocal-1.6 + rm -rf "${PREFIX}"/share/automake-1.6 + rm -rf "${PREFIX}"/share/aclocal-1.6 + + default_src_install +} diff --git a/sysa/run2.sh b/sysa/run2.sh index 82c43571..fadc238e 100755 --- a/sysa/run2.sh +++ b/sysa/run2.sh @@ -9,8 +9,8 @@ set -e . helpers.sh -build automake-1.5 stage1.sh -build automake-1.5 stage2.sh +build automake-1.6.3 stage1.sh +build automake-1.6.3 stage2.sh echo "Bootstrapping completed."