commit: b8fa98b64e1ef1b7cec664937b259c75b6da8202 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 24 13:35:45 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 24 13:36:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fa98b6
dev-build/automake-vanilla: fix tests Same as ad9bfdfb3e7aefb9a306dbd08fe10e39a7f3a7c8. Bug: https://bugs.gentoo.org/922676 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-build/automake-vanilla/Manifest | 1 + dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild | 13 ++++++++++++- dev-build/automake-vanilla/automake-vanilla-9999.ebuild | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dev-build/automake-vanilla/Manifest b/dev-build/automake-vanilla/Manifest index c4d5d7c16d57..bb286c7460e1 100644 --- a/dev-build/automake-vanilla/Manifest +++ b/dev-build/automake-vanilla/Manifest @@ -1,3 +1,4 @@ DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 +DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88 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 f789556c4555..b9485b55b4e2 100644 --- a/dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild +++ b/dev-build/automake-vanilla/automake-vanilla-1.16.5.ebuild @@ -17,7 +17,10 @@ else MY_PN=${PN/-vanilla} MY_P=${MY_PN}-${PV} - SRC_URI="mirror://gnu/${MY_PN}/${MY_P}.tar.xz" + SRC_URI=" + mirror://gnu/${MY_PN}/${MY_P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN/-vanilla}/${PN/-vanilla}-1.16.5-tests-c99.patch.xz + " S="${WORKDIR}/${MY_P}" fi @@ -45,6 +48,8 @@ BDEPEND=" test? ( ${PYTHON_DEPS} dev-util/dejagnu + sys-devel/bison + sys-devel/flex ) " @@ -54,6 +59,7 @@ PATCHES=( "${FILESDIR}"/${MY_PN}-1.16.5-fix-py-compile-basedir.sh-test.patch # upstreamed "${FILESDIR}"/${MY_PN}-1.16.5-apostrophe-in-tests.patch + "${WORKDIR}"/${PN/-vanilla}-1.16.5-tests-c99.patch ) pkg_setup() { @@ -86,6 +92,11 @@ src_configure() { --infodir="${MY_INFODIR}" } +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + src_install() { default diff --git a/dev-build/automake-vanilla/automake-vanilla-9999.ebuild b/dev-build/automake-vanilla/automake-vanilla-9999.ebuild index c7d543eaaeaf..f8bc9f1579a5 100644 --- a/dev-build/automake-vanilla/automake-vanilla-9999.ebuild +++ b/dev-build/automake-vanilla/automake-vanilla-9999.ebuild @@ -44,6 +44,8 @@ BDEPEND=" test? ( ${PYTHON_DEPS} dev-util/dejagnu + sys-devel/bison + sys-devel/flex ) " @@ -77,6 +79,11 @@ src_configure() { --infodir="${MY_INFODIR}" } +src_test() { + # Fails with byacc/flex + emake YACC="bison -y" LEX="flex" check +} + src_install() { default
