From 2fb08b9cd31149d6258956f343ca30056c99260f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 17 Mar 2021 22:17:11 +0000 Subject: [PATCH] Autoconf 2.53. --- SHA256SUMS.sources | 4 +- parts.rst | 9 +++- rootfs.sh | 5 ++- sysa/autoconf-2.52/stage2.sh | 2 +- sysa/autoconf-2.53/patches/autoconf_252.patch | 42 +++++++++++++++++++ sysa/autoconf-2.53/stage1.sh | 26 ++++++++++++ sysa/autoconf-2.53/stage2.sh | 20 +++++++++ sysa/run.sh | 3 ++ 8 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 sysa/autoconf-2.53/patches/autoconf_252.patch create mode 100755 sysa/autoconf-2.53/stage1.sh create mode 100755 sysa/autoconf-2.53/stage2.sh diff --git a/SHA256SUMS.sources b/SHA256SUMS.sources index b64b786..e2cb465 100644 --- a/SHA256SUMS.sources +++ b/SHA256SUMS.sources @@ -1,6 +1,7 @@ 66fde474e124e80c843560041cd68820c9dce56e696f388312ba30361a814a16 autoconf-2.12.tar.gz f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e autoconf-2.13.tar.gz -534e99b61b81e79327b6d08f1a3edb0755ac246e1249009b0e1bf5887b60d7a9 autoconf-2.52.tar.gz +4681bcbb9c9298c506f6405a7deb62c54fc3b339d3239a8f36a5df83daaec94f autoconf-2.52.tar.bz2 +6b217a064c6d06603d50a3ad05129aef9435367810c10894210b8dad965d2306 autoconf-2.53.tar.bz2 503cdc2b0992a4309545d17f462cb15f99bb57b7161dfc4082b2e7188f2bcc0f automake-1.4-p6.tar.gz 0dbafacaf21e135cab35d357a14bdcd981d2f2d00e1387801be8091a31b7bb81 automake-1.6.3.tar.bz2 ba03d412998cc54bd0b0f2d6c32100967d3137098affdc2d32e6e7c11b163fe4 bash-2.05b.tar.gz @@ -27,7 +28,6 @@ ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a patch-2.5.9.ta 1184478b298978b164a383ed5661e3a117c48ab97d6d0ab7ef614cdbe918b9eb perl5.004_05.tar.gz 93f41cd87ab8ee83391cfa39a63b076adeb7c3501d2efa31b98d0ef037122bd1 perl5.005_03.tar.gz a5e66f6ebf701b0567f569f57cae82abf5ce57af70a2b45ae71323b61f49134e perl-5.6.2.tar.gz -63ec0437ab1c3d62e8d63f8e6d604456c695bfcbe9297021ecc607fd90fd0da0 sed-4.0.7.tar.gz c365874794187f8444e5d22998cd5888ffa47f36def4b77517a808dec27c0600 sed-4.0.9.tar.gz 404a8d72427a559c074e581bf8f7d5a73283faf249cd3faf6dc1c6faf97d07c7 sha-2-61555d.tar.gz c6c37e888b136ccefab903c51149f4b7bd659d69d4aea21245f61053a57aa60a tar-1.12.tar.gz diff --git a/parts.rst b/parts.rst index e28e6f9..4b1e141 100644 --- a/parts.rst +++ b/parts.rst @@ -172,7 +172,7 @@ bzip2 1.0.8 is preferred where we can use it, and makes source code sizes smaller. coreutils 5.0 -=============== +============= GNU Coreutils is a collection of widely used utilities such as ``cat``, ``chmod``, ``chown``, ``cp``, ``install``, ``ln``, ``ls``, ``mkdir``, @@ -439,6 +439,13 @@ tcc 0.9.27 (musl v3) We rebuild tcc against new musl and without a patch to ignore duplicate symbols. +autoconf 2.53 +============= + +We now start bootstrapping newer versions of autoconf. Version 2.53 now uses ``perl``. +In order to build it with ``autoconf-2.52`` we have to patch it a bit and then do +a second unpatched build with newly built ``autoconf-2.53``. + bash 3.2.57 =========== diff --git a/rootfs.sh b/rootfs.sh index dea8213..9a5de8c 100755 --- a/rootfs.sh +++ b/rootfs.sh @@ -205,7 +205,7 @@ get_file https://www.cpan.org/src/5.0/perl5.005_03.tar.gz get_file https://www.cpan.org/src/5.0/perl-5.6.2.tar.gz # autoconf 2.52 -get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.gz +get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.52.tar.bz2 # automake 1.6.3 get_file https://ftp.gnu.org/gnu/automake/automake-1.6.3.tar.bz2 @@ -225,6 +225,9 @@ get_file https://ftp.gnu.org/gnu/libtool/libtool-1.4.tar.gz # binutils 2.14 get_file https://ftp.gnu.org/gnu/binutils/binutils-2.14.tar.bz2 +# autoconf 2.53 +get_file https://ftp.gnu.org/gnu/autoconf/autoconf-2.53.tar.bz2 + # bash 3.2.57 get_file https://ftp.gnu.org/gnu/bash/bash-3.2.57.tar.gz diff --git a/sysa/autoconf-2.52/stage2.sh b/sysa/autoconf-2.52/stage2.sh index 2be0069..7c78717 100755 --- a/sysa/autoconf-2.52/stage2.sh +++ b/sysa/autoconf-2.52/stage2.sh @@ -9,7 +9,7 @@ src_prepare() { automake-1.4 # Install autoconf data files into versioned directory - for file in */Makefile.in Makefile.in; do + for file in */Makefile.in Makefile.in; do sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file done } diff --git a/sysa/autoconf-2.53/patches/autoconf_252.patch b/sysa/autoconf-2.53/patches/autoconf_252.patch new file mode 100644 index 0000000..a4d0b0f --- /dev/null +++ b/sysa/autoconf-2.53/patches/autoconf_252.patch @@ -0,0 +1,42 @@ +SPDX-FileCopyrightText: 2021 Andrius Štikonas +SPDX-License-Identifier: GPL-3.0-or-later + +Disable features unsupported by Autoconf 2.52 + +--- configure.ac Wed Mar 17 19:53:06 2021 ++++ configure.ac.new Wed Mar 17 19:52:53 2021 +@@ -19,8 +19,7 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # 02111-1307, USA. + +-# We need AC_CONFIG_TESTDIR. +-AC_PREREQ([2.53]) ++AC_PREREQ([2.52]) + + AC_INIT([GNU Autoconf], [2.53], [bug-autoconf@gnu.org]) + AC_SUBST([PACKAGE_NAME])dnl +@@ -32,7 +31,6 @@ + AM_INIT_AUTOMAKE + + # Initialize the test suite and build position independent wrappers. +-AC_CONFIG_TESTDIR([tests]) + AC_CONFIG_FILES([tests/Makefile tests/atlocal]) + AC_CONFIG_FILES([tests/autoconf:tests/wrapsh.in], + [chmod +x tests/autoconf]) +@@ -85,16 +73,4 @@ + bin/Makefile]) + + AC_OUTPUT +-# Report the state of this version of Autoconf if this is a beta. +-m4_bmatch(m4_defn([AC_PACKAGE_VERSION]), [[a-z]], +-[ cat <. +- +-Below you will find information on the status of this version of Autoconf. +- + +-EOF +- sed -n '/^\* Status/,$p' $srcdir/BUGS +-]) diff --git a/sysa/autoconf-2.53/stage1.sh b/sysa/autoconf-2.53/stage1.sh new file mode 100755 index 0000000..f8ec1ca --- /dev/null +++ b/sysa/autoconf-2.53/stage1.sh @@ -0,0 +1,26 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default_src_prepare + + rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure + aclocal-1.6 + cat config/m4.m4 >> aclocal.m4 + autoconf-2.52 + automake-1.6 + + # Not supported by autoconf-2.52 + sed -i "s#@abs_top_builddir@#$PWD#" tests/wrappl.in + sed -i "s#@abs_top_srcdir@#$PWD#" tests/wrappl.in + + # Install autoconf data files into versioned directory + for file in */*/Makefile.in */Makefile.in Makefile.in; do + sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file + done +} + +src_configure() { + ./configure --prefix="${PREFIX}" --program-suffix=-2.53 +} diff --git a/sysa/autoconf-2.53/stage2.sh b/sysa/autoconf-2.53/stage2.sh new file mode 100755 index 0000000..e1f0971 --- /dev/null +++ b/sysa/autoconf-2.53/stage2.sh @@ -0,0 +1,20 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + rm Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure + aclocal-1.6 + cat config/m4.m4 >> aclocal.m4 + autoconf-2.53 + automake-1.6 + + # Install autoconf data files into versioned directory + for file in */*/Makefile.in */Makefile.in Makefile.in; do + sed -i '/^pkgdatadir/s:$:-@VERSION@:' $file + done +} + +src_configure() { + ./configure --prefix="${PREFIX}" --program-suffix=-2.53 +} diff --git a/sysa/run.sh b/sysa/run.sh index 024a087..e9ea69a 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -101,6 +101,9 @@ populate_device_nodes # Rebuild tcc-musl using new musl build tcc-0.9.27 tcc-musl-pass3.sh checksums/tcc-musl-pass3 +build autoconf-2.53 stage1.sh +build autoconf-2.53 stage2.sh + build bash-3.2.57 exec bash run2.sh