[gentoo-commits] repo/gentoo:master commit in: dev-build/automake/

["Sam James" <sam@gentoo.org>]

commit:     ad9bfdfb3e7aefb9a306dbd08fe10e39a7f3a7c8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 10:21:50 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 10:25:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad9bfdfb

dev-build/automake: fix modern C issues in tests, fix tests w/ byacc/reflex too

Bug: https://bugs.gentoo.org/922676
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-build/automake/Manifest                  |  1 +
 dev-build/automake/automake-1.16.5-r1.ebuild | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index ee180dcca549..8ba58d3e3240 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -1,2 +1,3 @@
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
+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/automake-1.16.5-r1.ebuild b/dev-build/automake/automake-1.16.5-r1.ebuild
index 0cde725c8964..25e29244ced0 100644
--- a/dev-build/automake/automake-1.16.5-r1.ebuild
+++ b/dev-build/automake/automake-1.16.5-r1.ebuild
@@ -18,8 +18,11 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P="${P}"
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+		SRC_URI="
+			mirror://gnu/${PN}/${P}.tar.xz
+			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.16.5-tests-c99.patch.xz
+		"
 		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	else
 		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
@@ -54,6 +57,8 @@ BDEPEND="
 	test? (
 		${PYTHON_DEPS}
 		dev-util/dejagnu
+		sys-devel/bison
+		sys-devel/flex
 	)
 "
 
@@ -63,6 +68,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
 	"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
 	"${FILESDIR}"/${PN}-1.16.5-parallel-build.patch
+	"${WORKDIR}"/${PN}-1.16.5-tests-c99.patch
 )
 
 pkg_setup() {
@@ -92,6 +98,11 @@ src_configure() {
 	econf --infodir="${MY_INFODIR}"
 }
 
+src_test() {
+	# Fails with byacc/flex
+	emake YACC="bison -y" LEX="flex" check
+}
+
 src_install() {
 	default