From f2e542ef0c4aba5af818688d3e61c52e3ad7ea0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Tue, 24 Jan 2023 22:18:11 +0000 Subject: [PATCH] Do not build doc directory of automake 2.11 and 2.15. There is a race condition there that often causes builds to fail. Fixes: #184 --- sysa/SHA256SUMS.pkgs | 4 ++-- sysc/automake-1.11.2/automake-1.11.2.sh | 5 ++++- sysc/automake-1.15.1/automake-1.15.1.sh | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs index c512c88..4bcb63d 100644 --- a/sysa/SHA256SUMS.pkgs +++ b/sysa/SHA256SUMS.pkgs @@ -14,8 +14,8 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4 autoconf-2.64_ 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b autoconf-archive-2021.02.19_0.tar.bz2 9f5da26c871827c17a9d571cefdfa8f3711717b32b2667fa871aaf5abf5efa09 autogen-5.18.16_0.tar.bz2 fbd8739c8f69b388e2c54893faa1180cc38f2718339da82788312adb0201c5d0 automake-1.10.3_0.tar.bz2 -e5eae329b2f6854c18844df70fe13975d3c5394708e274616bc4168e55801b41 automake-1.11.2_0.tar.bz2 -732d12fdeea2c234750c8e91c90a90934d279283839cdabe0343fa765ba24168 automake-1.15.1_0.tar.bz2 +7014bcba2fc112f3c22129a69b32dd3939eac97267d0ee271aa35853fdeee9fe automake-1.11.2_0.tar.bz2 +a7bd12bd0c639783ce1c0e9f640cf004a87460bbda8154bc550c5e6884457b48 automake-1.15.1_0.tar.bz2 57100612d902537b72ee2fd3dfecc903f2ea3959f1a480af87c6a1ef9a9d7c03 automake-1.16.3_0.tar.bz2 51ef85383c0afe88c17a25f8b49c4dfdd77c1cc6aa81568ec09d45a15d580de8 automake-1.4-p6_0.tar.bz2 8ec3af09fd23256f89b27833a8311ed347caf93d611b1209232ce104bb6fb4ef automake-1.6.3_0.tar.bz2 diff --git a/sysc/automake-1.11.2/automake-1.11.2.sh b/sysc/automake-1.11.2/automake-1.11.2.sh index 7b75c73..2ff95d5 100755 --- a/sysc/automake-1.11.2/automake-1.11.2.sh +++ b/sysc/automake-1.11.2/automake-1.11.2.sh @@ -8,6 +8,10 @@ src_prepare() { rm -f doc/amhello-1.0.tar.gz doc/automake.info* doc/aclocal-1.11.1 doc/automake-1.11.1 + # Building doc often causes race conditions, skip it + awk '/SUBDIRS/{sub("doc ", "", $0)} {print}' Makefile.am > Makefile.am.tmp + mv Makefile.am{.tmp,} + AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 ./bootstrap } @@ -22,5 +26,4 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" - rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz" } diff --git a/sysc/automake-1.15.1/automake-1.15.1.sh b/sysc/automake-1.15.1/automake-1.15.1.sh index 7db35b1..9195980 100755 --- a/sysc/automake-1.15.1/automake-1.15.1.sh +++ b/sysc/automake-1.15.1/automake-1.15.1.sh @@ -8,11 +8,13 @@ src_prepare() { rm doc/amhello-1.0.tar.gz + # 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 AUTOM4TE=autom4te-2.69 ./bootstrap rm doc/automake-history.info doc/automake.info* - - cp "${PREFIX}/bin/help2man" doc/ } src_configure() { @@ -26,5 +28,4 @@ src_compile() { src_install() { make install MAKEINFO=true DESTDIR="${DESTDIR}" rm "${DESTDIR}/usr/bin/automake" "${DESTDIR}/usr/bin/aclocal" - rm "${DESTDIR}${PREFIX}/share/doc/automake/amhello-1.0.tar.gz" }