commit: 7b8499943ab93e837b92eceaf8b85e5646327b7f Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Thu Feb 27 06:52:35 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Thu Feb 27 07:02:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b849994
sys-devel/patch: require specific automake version We apply patches to Makefile.am, so we must run eautomake (but running all of eautoreconf isn't necessary). Successfully doing so requires knowing exactly which version of automake to use, which works great as it is slotted, except we did not in fact actually specify it. In theory, autotools.eclass detects mismatches and forces a full eautoreconf. This is broken in two ways: - I had originally optimistically set WANT_AUTOCONF=none, so we might not have what we need in such a case - the logic is actually broken, entwined with the effects of a commit from 2009 in gentoo-historical-2.git: 773f4f230b88ffbcc9de281f83dbd1c905965564 This wiped out WANT_AUTOMAKE= when checking the installed version due to ??? (it was 2009 so who knows whether it was always broken or is simply incompatible with later changes any time in the next 16 years) and causes automake to "see" a different version for comparison than the one that actually runs. The eclass is clearly broken *today* either way, and investigation is ongoing as to how to fix it, but this is a moot point for the purpose of sys-devel/patch... I originally didn't notice this as Patch was created with automake 1.16, which was also the latest version stable in Gentoo. Well erm, sort of. 1.17 was stabled barely a day ago and I simply hadn't gotten upgraded to it yet. Oops. "configure.ac:33: error: version mismatch." Forcing the correct slotted automake solves all (okay fine, *most* of) our problems. Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild b/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild index ebd328194d67..0c0ae58d62c4 100644 --- a/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6_p20250206-r1.ebuild @@ -5,6 +5,7 @@ EAPI=8 WANT_AUTOCONF=none WANT_LIBTOOL=none +WANT_AUTOMAKE=1.16 inherit autotools VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/patch.asc
