commit: 9b5c6ca3a19d656caf389689b72e8ce291a02903 parent 4a1730da29bee80baa7778fb80da5dd5eeaf2798 Author: Andrius Štikonas <andrius@stikonas.eu> Date: Sun, 12 Jun 2022 17:36:00 +0100 Do not install pre-generated manpages. Also remove redundant autotools stages. Early manpages in autoconf 2.52-2.59 are removed from output. Later ones are regenerated with help2man. Fixes #182Diffstat:
21 files changed, 146 insertions(+), 269 deletions(-)diff --git a/parts.rst b/parts.rst@@ -406,8 +406,7 @@ 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``. +In order to build it with ``autoconf-2.52`` we have to patch it a bit. automake 1.7 ============ @@ -420,11 +419,6 @@ autoconf 2.54 More ``autoconf``. -automake 1.7 -============ - -Rebuild ``automake`` with ``autoconf-2.54``. - autoconf 2.55 ============= @@ -469,7 +463,7 @@ automake 1.9.6 ============== Latest GNU Automake from 1.9 series. Slightly annoyingly depends itself but it is easy to patch -to make it buildable with 1.8.5. Then we rebuild ``automake-1.9`` with itself. +to make it buildable with 1.8.5. findutils 4.2.33 ================diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs@@ -1,17 +1,14 @@ 2fde9f584a275efc5c8bf23adaa690e06ab6922ecbc35108731e87f565ddb2b6 autoconf-2.12_0.tar.bz2 40d88d4b1048ab70eaecf753fb77713dfcaa9c9c72252cd36459236034cdcdfd autoconf-2.13_0.tar.bz2 38f0de4c816088c514dbfb1536779f2204426a95bd6f57fa87b83bffefcaa390 autoconf-2.52_0.tar.bz2 -479627e99e33bbaed320dd569ab6c77867001ddafb08de02f172c6da1a73c4e1 autoconf-2.52_1.tar.bz2 -b8e0f20ef47540b4a8e9532628bfc43d15f6b375c111cca3727b217019a5992f autoconf-2.53_0.tar.bz2 -b8e0f20ef47540b4a8e9532628bfc43d15f6b375c111cca3727b217019a5992f autoconf-2.53_1.tar.bz2 -72b2321a83efb7c45dd6fce2afe8f88f6e75063793c6fd109bf88771c6c38687 autoconf-2.54_0.tar.bz2 -7c8a2655773c7a75109d8c6c9d0cd6a9dbf30a1373afcc171d5f044f9ac89414 autoconf-2.54_1.tar.bz2 -fd8d5162abf4bb2da84febc1779be876b4fddd4b58301f46958511ce80be7f8c autoconf-2.55_0.tar.bz2 -d3013965c6b9800433da1c5d9b1c1df0223661ba348c26c5be7ab18d8eae02de autoconf-2.57_0.tar.bz2 -d05aed2f6ce18e0fe201522968ad1163451105200db2dd71ca0c68993f7020de autoconf-2.59_0.tar.bz2 -352e1489841c6cc506865594987f492d1e3fedf710b1058483d78f414fd3310c autoconf-2.61_0.tar.bz2 -5302730ab0370f84b527333713bbcc79d4d2d32d7bbd1d28203acdbb969888e9 autoconf-2.61_1.tar.bz2 -a08181af36c34325b421de2bd3d60c11866dc8acb593fb9949bb3af7dcb793b6 autoconf-2.64_0.tar.bz2 +912dd3cc26c14eda0810758661892c53cdd715e2224893c4b467f210e9af0d4a autoconf-2.52_1.tar.bz2 +44c8ffbcfb7afd82e079ca779a5e8812d93edcb44caf6db7cf5d5e999f04bab6 autoconf-2.53_0.tar.bz2 +dc6713f9e9ea9dfdccbf43dcb673505d965fd908f47cf60659a043008a13be4c autoconf-2.54_0.tar.bz2 +28f7fa43c5154dd28f2a69e7c2c869eb96b771bfe545d68129284447f4239f28 autoconf-2.55_0.tar.bz2 +d277abf366bfaff1f4612a649ecf8afc7bd647e4766ad00fd5fb188e73386609 autoconf-2.57_0.tar.bz2 +acb67a181d8f345e011f29e1ae9f41ee2cf108e6d41ac54e62f1cd85f614c105 autoconf-2.59_0.tar.bz2 +d0575d1e705fb37b8b9e5772e9aa6f633b3cb825d005a20d410d750374fea288 autoconf-2.61_0.tar.bz2 +26335026820d9999c8147959205a0b184705630319427385d9140c13799bee99 autoconf-2.64_0.tar.bz2 35c37852cc4eab1ff9a2a9fd924385fd12c89b1281aa84ff7b9cdca2ad3dbd36 autoconf-2.69_0.tar.bz2 d713ac1840e82250414ee4f7cd75c79ee44ecb4e8dfc659704eed3d75e7d348c autoconf-2.71_0.x86.xbps 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2 @@ -25,10 +22,8 @@ cf6b7bbdba1a58b0cc1e6dae36a82e3b28db8ee1e948225d72530accee32aaab automake-1.10. b2eab85c4a22060cc18945f6cb24cdf928fee370fff3fe12482e866a1cace586 automake-1.6.3_2.tar.bz2 ddd61cfdaea7a7a9b85eff7e2e597bf6c8af05215e34fd05a5c97f6afc5c31ef automake-1.7.8_0.tar.bz2 8f8c29596333ddb8bf3d0e7ed5ee514e75cd248f06961f1ef666e6410e2d384c automake-1.7_0.tar.bz2 -8f8c29596333ddb8bf3d0e7ed5ee514e75cd248f06961f1ef666e6410e2d384c automake-1.7_1.tar.bz2 d52aa64563e2a6fce48bb751fab9802a997772132d9e612ec77274e0e9bac3c9 automake-1.8.5_0.tar.bz2 df5ab8ac7f13eb7aa5211ad4609578f0bb1ed4957ac5737cb78466f644760019 automake-1.9.6_0.tar.bz2 -df5ab8ac7f13eb7aa5211ad4609578f0bb1ed4957ac5737cb78466f644760019 automake-1.9.6_1.tar.bz2 e180c61e3922b0546a6a3ee498abeba6dfdd404215ca850628a5277e5ede26e7 bash-5.1_0.tar.bz2 a6190872c4daf1b55a1ad1f2fd2e34bd251f3808f750bb4a7920b66d672497a8 binutils-2.14_0.tar.bz2 f566a5cb99adc8f572659ebf4a778ff23acf62d90b13a9983f56488a493b15b2 bison-2.3_0.tar.bz2diff --git a/sysa/autoconf-2.52/stage2.sh b/sysa/autoconf-2.52/stage2.sh@@ -6,6 +6,10 @@ src_prepare() { rm doc/standards.info doc/autoconf.info rm -- Makefile.in */Makefile.in rm configure + + # Do not use pregenerated manpages + sed -i '/SUBDIRS/s/ man//' Makefile.am + autoconf-2.52 automake-1.4diff --git a/sysa/autoconf-2.53/autoconf-2.53.sh b/sysa/autoconf-2.53/autoconf-2.53.sh@@ -0,0 +1,39 @@ +# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu> +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure + rm doc/standards.info doc/autoconf.info + + # Do not use pregenerated manpages + sed -i '/SUBDIRS/s/ man//' Makefile.am + + 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 +} + +src_compile() { + make MAKEINFO=true DESTDIR="${DESTDIR}" +} + +src_install() { + make install MAKEINFO=true DESTDIR="${DESTDIR}" +}diff --git a/sysa/autoconf-2.53/stage1.sh b/sysa/autoconf-2.53/stage1.sh@@ -1,36 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - default - - rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure - rm doc/standards.info doc/autoconf.info - - 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 -} - -src_compile() { - make MAKEINFO=true DESTDIR="${DESTDIR}" -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" -}diff --git a/sysa/autoconf-2.53/stage2.sh b/sysa/autoconf-2.53/stage2.sh@@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure - rm doc/standards.info doc/autoconf.info - - 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 -} - -src_compile() { - make MAKEINFO=true DESTDIR="${DESTDIR}" -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" -}diff --git a/sysa/autoconf-2.54/autoconf-2.54.sh b/sysa/autoconf-2.54/autoconf-2.54.sh@@ -0,0 +1,43 @@ +# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu> +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + rm bin/autoconf.in + rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure + rm doc/standards.info doc/autoconf.info + + # Do not use pregenerated manpages + sed -i '/SUBDIRS/s/ man//' Makefile.am + + aclocal-1.7 + sed -i 's/2.54/2.53/' aclocal.m4 + cat config/m4.m4 >> aclocal.m4 + autoconf-2.53 + + # Otherwise automake-1.7 fails to find autoconf + ln -s "${PREFIX}"/bin/autoconf-2.53 "${PREFIX}"/bin/autoconf + automake-1.7 + + # 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.54 +} + +src_compile() { + # Workaround for racy make dependencies + make -C bin autom4te + make -C lib + make MAKEINFO=true +} + +src_install() { + make install MAKEINFO=true DESTDIR="${DESTDIR}" + + ln -sf "${PREFIX}"/bin/autoconf-2.54 "${DESTDIR}${PREFIX}"/bin/autoconf +}diff --git a/sysa/autoconf-2.54/stage1.sh b/sysa/autoconf-2.54/stage1.sh@@ -1,39 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm bin/autoconf.in - rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure - rm doc/standards.info doc/autoconf.info - aclocal-1.7 - sed -i 's/2.54/2.53/' aclocal.m4 - cat config/m4.m4 >> aclocal.m4 - autoconf-2.53 - - # Otherwise automake-1.7 fails to find autoconf - ln -s "${PREFIX}"/bin/autoconf-2.53 "${PREFIX}"/bin/autoconf - automake-1.7 - - # 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.54 -} - -src_compile() { - # Workaround for racy make dependencies - make -C bin autom4te - make -C lib - make MAKEINFO=true -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" - - ln -sf "${PREFIX}"/bin/autoconf-2.54 "${DESTDIR}${PREFIX}"/bin/autoconf -}diff --git a/sysa/autoconf-2.54/stage2.sh b/sysa/autoconf-2.54/stage2.sh@@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm bin/autoconf.in - rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure - rm doc/standards.info doc/autoconf.info - - autoreconf-2.54 - - # 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.54 -} - -src_compile() { - # Workaround for racy make dependencies - make -C bin autom4te - make -C lib - make MAKEINFO=true -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" -}diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/sysa/autoconf-2.55/autoconf-2.55.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -7,6 +7,9 @@ src_prepare() { rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure rm doc/standards.info doc/autoconf.info + # Do not use pregenerated manpages + sed -i '/SUBDIRS/s/ man//' Makefile.am + autoreconf-2.54 # Install autoconf data files into versioned directorydiff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/sysa/autoconf-2.57/autoconf-2.57.sh@@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# SPDX-FileCopyrightText: 2021-2022 Andrius Štikonas <andrius@stikonas.eu> # # SPDX-License-Identifier: GPL-3.0-or-later @@ -6,6 +6,9 @@ src_prepare() { rm bin/autoconf.in rm doc/standards.info + # Do not use pregenerated manpages + sed -i '/SUBDIRS/s/ man//' Makefile.am + autoreconf-2.55 -f # Install autoconf data files into versioned directorydiff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/sysa/autoconf-2.59/autoconf-2.59.sh@@ -6,6 +6,9 @@ src_prepare() { rm bin/autoconf.in rm doc/standards.info + # Do not use pregenerated manpages + sed -i '/SUBDIRS/s/ man//' Makefile.am + autoreconf-2.57 -f # Install autoconf data files into versioned directorydiff --git a/sysa/autoconf-2.61/autoconf-2.61.sh b/sysa/autoconf-2.61/autoconf-2.61.sh@@ -0,0 +1,32 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + rm doc/standards.info man/*.1 + sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac + + autoreconf-2.59 -f + + # 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.61 +} + +src_compile() { + make MAKEINFO=true +} + +src_install() { + make install MAKEINFO=true DESTDIR="${DESTDIR}" + + ln -sf "${PREFIX}/bin/autoconf-2.61" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.61" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.61" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.61" "${DESTDIR}${PREFIX}/bin/autoreconf" +}diff --git a/sysa/autoconf-2.61/stage1.sh b/sysa/autoconf-2.61/stage1.sh@@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm doc/standards.info - sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac - autoreconf-2.59 -f - - # 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.61 -} - -src_compile() { - make MAKEINFO=true -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" - - ln -sf "${PREFIX}/bin/autoconf-2.61" "${DESTDIR}${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.61" "${DESTDIR}${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.61" "${DESTDIR}${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.61" "${DESTDIR}${PREFIX}/bin/autoreconf" -}diff --git a/sysa/autoconf-2.61/stage2.sh b/sysa/autoconf-2.61/stage2.sh@@ -1,25 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm doc/standards.info - autoreconf-2.61 -f - - # 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.61 -} - -src_compile() { - make MAKEINFO=true -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" -}diff --git a/sysa/autoconf-2.64/autoconf-2.64.sh b/sysa/autoconf-2.64/autoconf-2.64.sh@@ -3,7 +3,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later src_prepare() { - rm doc/standards.info + rm doc/standards.info man/*.1 + autoreconf-2.61 -f # Install autoconf data files into versioned directorydiff --git a/sysa/automake-1.7/stage1.sh b/sysa/automake-1.7/automake-1.7.shdiff --git a/sysa/automake-1.7/stage2.sh b/sysa/automake-1.7/stage2.sh@@ -1,21 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm -- configure Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 automake.info* - - autoreconf-2.54 -} - -src_configure() { - ./configure --prefix="${PREFIX}" -} - -src_compile() { - make MAKEINFO=true -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" -}diff --git a/sysa/automake-1.9.6/stage1.sh b/sysa/automake-1.9.6/automake-1.9.6.shdiff --git a/sysa/automake-1.9.6/stage2.sh b/sysa/automake-1.9.6/stage2.sh@@ -1,21 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu> -# -# SPDX-License-Identifier: GPL-3.0-or-later - -src_prepare() { - rm doc/automake.info* - - autoreconf-2.61 -f -} - -src_configure() { - ./configure --prefix="${PREFIX}" -} - -src_compile() { - make MAKEINFO=true -} - -src_install() { - make install MAKEINFO=true DESTDIR="${DESTDIR}" -}diff --git a/sysa/run.sh b/sysa/run.sh@@ -179,15 +179,11 @@ build tcc-0.9.27 tcc-musl-pass3.sh patches-musl-pass3 populate_device_nodes -build autoconf-2.53 stage1.sh -build autoconf-2.53 stage2.sh +build autoconf-2.53 -build automake-1.7 stage1.sh +build automake-1.7 -build autoconf-2.54 stage1.sh -build autoconf-2.54 stage2.sh - -build automake-1.7 stage2.sh +build autoconf-2.54 build autoconf-2.55 @@ -201,11 +197,9 @@ build automake-1.8.5 build help2man-1.36.4 -build autoconf-2.61 stage1.sh -build autoconf-2.61 stage2.sh +build autoconf-2.61 -build automake-1.9.6 stage1.sh -build automake-1.9.6 stage2.sh +build automake-1.9.6 build findutils-4.2.33