Merge pull request #507 from fosslinux/autoconf-fixes

Autotools fixes
fosslinux · Feb 10, 2025 · 0373292 · 0373292
2 parents 8e6fa2f + b74a111
commit 0373292
Show file tree

Hide file tree

Showing 18 changed files with 58 additions and 18 deletions.
diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
@@ -7,13 +7,13 @@ b687370caaa654ba2fc622188240f50ea305a1c926accbced153df9179697adf  autoconf-2.53_
 836f0ec53e05a05602d9ef4ae050eb294735337bf647715e227d1b5bc0526c6b  autoconf-2.61_0.tar.bz2
 7702fe8724549641eb6a03c737f2414faecb23297a5bdb57e42326e98153de41  autoconf-2.64_0.tar.bz2
 b363f22b42418fb2507bf722b0a6b5b03410ac58c44c400767d650d828696eaa  autoconf-2.69_0.tar.bz2
-204aeb532e074001dc0f01dc51fcefe3f7483d388dc334a098fa340475c91191  autoconf-2.71_0.tar.bz2
+cde51b816fcce47742064f9dc0b4871e4194190be5065dc1852b39339cc9115b  autoconf-2.71_0.tar.bz2
 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b  autoconf-archive-2021.02.19_0.tar.bz2
 f095fe12baf0d5899d8a5a6b735da014f8e087ff5cf5183e03b6c0b454be2f30  autogen-5.18.16_0.tar.bz2
 02a426e82a52d4a2cd7e73fe3dc5a2c58b3ed100f24a92c57e42511fd86e247c  automake-1.10.3_0.tar.bz2
 34925adeaa2876a5e068adeb17b71fe7c7105244c3cb5439d33f7406310674da  automake-1.11.2_0.tar.bz2
 7e36e9e4b3957c95b6de8ff475c9b37aa007e2f9735b01c0eaf14b711fdd112f  automake-1.15.1_0.tar.bz2
-57100612d902537b72ee2fd3dfecc903f2ea3959f1a480af87c6a1ef9a9d7c03  automake-1.16.3_0.tar.bz2
+a7f8c17dbc6e4ec5ff0186a0ddf2266a23c1579321c52c2faf8e11fafa232281  automake-1.16.3_0.tar.bz2
 1c7e09ac08f156960420fca1f6e8560c1855bf01b001a0648b56153d6ceb9c28  automake-1.6.3_0.tar.bz2
 444131776779d1f27628088a817bfb8c9aa85f4b036b934794a71e484ec9bd70  automake-1.6.3_1.tar.bz2
 ef08694bf8e78ffcf56f9c8a63b0f189e301c06f02ab240e15e4c7fe354c2a0d  automake-1.7_0.tar.bz2

diff --git a/steps/autoconf-2.52/pass1.sh b/steps/autoconf-2.52/pass1.sh
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_compile() {
-    rm doc/standards.info doc/autoconf.info
+    rm doc/*.info
     cp autoconf.in autoconf
     sed -i -e "s# @SHELL@#/bin/sh#" -e 's/@M4@/m4/' -e 's/@AWK@/awk/' \
 	-e  's/@PACKAGE_NAME@/Autoconf/' -e 's/@VERSION@/2.52/' \

diff --git a/steps/autoconf-2.53/pass1.sh b/steps/autoconf-2.53/pass1.sh
@@ -6,7 +6,9 @@ src_prepare() {
     default
 
     rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
-    rm doc/standards.info doc/autoconf.info
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
 
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am

diff --git a/steps/autoconf-2.54/pass1.sh b/steps/autoconf-2.54/pass1.sh
@@ -5,7 +5,9 @@
 src_prepare() {
     rm bin/autoconf.in
     rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
-    rm doc/standards.info doc/autoconf.info
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
 
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am

diff --git a/steps/autoconf-2.55/pass1.sh b/steps/autoconf-2.55/pass1.sh
@@ -5,7 +5,9 @@
 src_prepare() {
     rm bin/autoconf.in
     rm -- Makefile.in */Makefile.in */*/Makefile.in aclocal.m4 configure
-    rm doc/standards.info doc/autoconf.info
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
 
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am

diff --git a/steps/autoconf-2.57/pass1.sh b/steps/autoconf-2.57/pass1.sh
@@ -4,7 +4,9 @@
 
 src_prepare() {
     rm bin/autoconf.in
-    rm doc/standards.info
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
 
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am

diff --git a/steps/autoconf-2.59/pass1.sh b/steps/autoconf-2.59/pass1.sh
@@ -4,7 +4,9 @@
 
 src_prepare() {
     rm bin/autoconf.in
-    rm doc/standards.info
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
 
     # Do not use pregenerated manpages
     sed -i '/SUBDIRS/s/ man//' Makefile.am

diff --git a/steps/autoconf-2.61/pass1.sh b/steps/autoconf-2.61/pass1.sh
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm doc/standards.info man/*.1
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
     sed -i -e '/AC_PROG_GREP/d' -e '/AC_PROG_SED/d' configure.ac
 
     AUTOMAKE=automake-1.8 ACLOCAL=aclocal-1.8 AUTOM4TE=autom4te-2.59 AUTOCONF=autoconf-2.59 autoreconf-2.59 -f

diff --git a/steps/autoconf-2.64/pass1.sh b/steps/autoconf-2.64/pass1.sh
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm doc/standards.info man/*.1
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
 
     AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 autoreconf-2.61 -f
 

diff --git a/steps/autoconf-2.69/pass1.sh b/steps/autoconf-2.69/pass1.sh
@@ -4,7 +4,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm doc/standards.info man/*.1
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
     AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 autoreconf-2.64 -f
 
     # Install autoconf data files into versioned directory

diff --git a/steps/autoconf-2.71/pass1.sh b/steps/autoconf-2.71/pass1.sh
@@ -3,7 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    rm doc/standards.info
+    rm doc/*.info
+    rm man/*.1
+    rm tests/*.at
     autoreconf-2.69 -fi
 
     # Install autoconf data files into versioned directory

diff --git a/steps/autoconf-archive-2021.02.19/pass1.sh b/steps/autoconf-archive-2021.02.19/pass1.sh
@@ -4,6 +4,8 @@
 
 src_prepare() {
     AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
+
+    rm doc/*.info*
 }
 
 src_configure() {

diff --git a/steps/automake-1.11.2/pass1.sh b/steps/automake-1.11.2/pass1.sh
@@ -7,6 +7,7 @@ src_prepare() {
     default
 
     rm -f doc/amhello-1.0.tar.gz doc/automake.info* doc/aclocal-1.11.1 doc/automake-1.11.1
+    rm tests/parallel-tests.am
 
     # Building doc often causes race conditions, skip it
     awk '/SUBDIRS/{sub("doc ", "", $0)} {print}' Makefile.am > Makefile.am.tmp

diff --git a/steps/automake-1.15.1/pass1.sh b/steps/automake-1.15.1/pass1.sh
@@ -6,15 +6,16 @@
 src_prepare() {
     default
 
-    rm doc/amhello-1.0.tar.gz
+    rm doc/amhello-1.0.tar.gz doc/automake-history.info doc/automake.info*
+    grep "DO NOT EDIT BY HAND" -r t -l | while read f; do
+        rm "$f"
+    done
 
     # Building doc often causes race conditions, skip it
     sed -i '/doc\/Makefile.inc/d' Makefile.am
     sed -i '/t\/Makefile.inc/d' Makefile.am
 
     AUTOCONF="autoconf-2.69 -f" AUTOM4TE=autom4te-2.69 ./bootstrap
-
-    rm doc/automake-history.info doc/automake.info*
 }
 
 src_configure() {

diff --git a/steps/automake-1.16.3/pass1.sh b/steps/automake-1.16.3/pass1.sh
@@ -1,13 +1,24 @@
 # SPDX-FileCopyrightText: 2021 Andrius Štikonas <[email protected]>
+# SPDX-FileCopyrightText: 2025 fosslinux <[email protected]>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
+    # Disable amhello, it is not reproducible
+    rm doc/amhello-1.0.tar.gz
+    sed -i "/^dist_doc_DATA =/d" doc/local.mk
+
     AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 ./bootstrap
 
     rm doc/automake-history.info doc/automake.info*
+    grep "DO NOT EDIT BY HAND" -r t -l | while read f; do
+        rm "$f"
+    done
 
     cp "${PREFIX}/bin/help2man" doc/
+
+    perl ./gen-testsuite-part --srcdir . > t/testsuite-part.am
+    touch Makefile.in # timestamps for make rules
 }
 
 src_configure() {

diff --git a/steps/libtool-2.2.4/pass1.sh b/steps/libtool-2.2.4/pass1.sh
@@ -6,9 +6,14 @@
 src_prepare() {
     default
 
-    rm -f libltdl/config/ltmain.sh libtool
+    rm -f libltdl/config/ltmain.sh libtool libltdl/m4/ltversion.m4
 
     rm -f doc/*.info
+    rm -f tests/testsuite
+
+    find tests -name configure | while read d; do
+        rm -r "$(dirname "$d")"
+    done
 
     AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 AUTOM4TE=autom4te-2.61 AUTOCONF=autoconf-2.61 AUTOHEADER=autoheader-2.61 AUTORECONF=autoreconf-2.61 ./bootstrap
 }

diff --git a/steps/libtool-2.4.7/pass1.sh b/steps/libtool-2.4.7/pass1.sh
@@ -9,8 +9,9 @@ src_prepare() {
     default
 
     rm -f build-aux/ltmain.sh
-    rm -f doc/*.info
+    rm -f doc/*.info doc/*.1
     rm -f bootstrap
+    rm -f tests/testsuite
 
     ../../import-gnulib.sh
 

diff --git a/steps/m4-1.4.19/pass1.sh b/steps/m4-1.4.19/pass1.sh
@@ -5,10 +5,11 @@
 src_prepare() {
     . ../../import-gnulib.sh
 
-    rm doc/*.1
+    rm doc/*.1 doc/*.info* po/*.gmo
 
     rm lib/iconv_open*.h
 
+    rm bootstrap
     autoreconf-2.71 -fi
 }