commit: b0e9d4be9e50837c9a37c285e3bfc800b6ca5e6c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 27 20:00:38 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 27 20:01:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e9d4be
dev-build/automake-vanilla: partially fix tests & restrict them Tests mostly pass now but would need some backports for e.g. newer dejagnu and not worth doing. Closes: https://bugs.gentoo.org/923596 Closes: https://bugs.gentoo.org/939752 Signed-off-by: Sam James <sam <AT> gentoo.org> .../automake-vanilla/automake-vanilla-1.15.1.ebuild | 21 +++++++++++++++++---- .../automake-vanilla/automake-vanilla-1.16.5.ebuild | 14 ++++++++++---- .../automake-vanilla/automake-vanilla-1.17.ebuild | 2 +- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dev-build/automake-vanilla/automake-vanilla-1.15.1.ebuild b/dev-build/automake-vanilla/automake-vanilla-1.15.1.ebuild index dd59ac0ef129..7dcd7a9f5344 100644 --- a/dev-build/automake-vanilla/automake-vanilla-1.15.1.ebuild +++ b/dev-build/automake-vanilla/automake-vanilla-1.15.1.ebuild @@ -6,9 +6,9 @@ EAPI=8 # Please do not apply any patches which affect the generated output from # `automake`, as this package is used to submit patches upstream. -PYTHON_COMPAT=( python3_11 ) +PYTHON_COMPAT=( python3_{11..14} ) -inherit python-any-r1 +inherit flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/r/${MY_PN}.git"; @@ -30,7 +30,8 @@ LICENSE="GPL-2+ FSFAP" SLOT="${PV:0:4}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" IUSE="test" -RESTRICT="!test? ( test )" +# Failures w/ newer dejagnu, not worth backporting the fixes +RESTRICT="!test? ( test ) test" RDEPEND=" >=dev-lang/perl-5.6 @@ -41,6 +42,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" app-alternatives/gzip + dev-build/autoconf-vanilla:2.69 sys-apps/help2man test? ( ${PYTHON_DEPS} @@ -56,7 +58,7 @@ pkg_setup() { src_prepare() { default - export WANT_AUTOCONF=2.5 + export WANT_AUTOCONF=vanilla-2.69 # Don't try wrapping the autotools - this thing runs as it tends # to be a bit esoteric, and the script does `set -e` itself. ./bootstrap || die @@ -69,6 +71,9 @@ src_prepare() { } src_configure() { + # Old lex tests fail w/ modern C + export CC="$(tc-getCC) $(test-flags-CC -fpermissive)" + use test && python_setup # Also used in install. MY_INFODIR="${EPREFIX}/usr/share/${P}/info" @@ -78,6 +83,14 @@ src_configure() { --infodir="${MY_INFODIR}" } +src_test() { + # Can't cope with newer Python versions, so pretend we don't + # have it installed. + local -x PYTHON=false + + default +} + src_install() { default diff --git a/dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild b/dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild index 25e50d5e1f61..276412e8b90c 100644 --- a/dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild +++ b/dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please do not apply any patches which affect the generated output from # `automake`, as this package is used to submit patches upstream. -PYTHON_COMPAT=( python3_11 ) +PYTHON_COMPAT=( python3_{11..14} ) inherit python-any-r1 @@ -33,7 +33,8 @@ LICENSE="GPL-2+ FSFAP" SLOT="${PV:0:4}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos" IUSE="test" -RESTRICT="!test? ( test )" +# Failures w/ newer dejagnu, not worth backporting the fixes +RESTRICT="!test? ( test ) test" RDEPEND=" >=dev-lang/perl-5.6 @@ -93,8 +94,13 @@ src_configure() { } src_test() { - # Fails with byacc/flex - emake YACC="bison -y" LEX="flex" check + # Can't cope with newer Python versions, so pretend we don't + # have it installed. + local -x PYTHON=false + + # Fails with byacc/flex and t/dist-auxdir-many-subdirs.sh doesn't + # like our Python hack. + emake YACC="bison -y" LEX="flex" XFAIL_TESTS="t/dist-auxdir-many-subdirs.sh" check } src_install() { diff --git a/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild b/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild index e79a84c4a668..62b78a01f445 100644 --- a/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild +++ b/dev-build/automake-vanilla/automake-vanilla-1.17.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please do not apply any patches which affect the generated output from # `automake`, as this package is used to submit patches upstream. -PYTHON_COMPAT=( python3_{11..12} ) +PYTHON_COMPAT=( python3_{11..14} ) inherit python-any-r1
