commit: 67e62445b8a9e6428f4c6abc67617e013887f078 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Mar 4 07:33:19 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 4 07:33:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e62445
app-accessibility/flite: fix build w/ make-4.4 Keeping -j1 as the upstream PR notes it's not complete. Closes: https://bugs.gentoo.org/879069 Signed-off-by: Sam James <sam <AT> gentoo.org> .../flite/files/flite-2.2-make-4.4.patch | 60 ++++++++++++++++++++++ app-accessibility/flite/flite-2.2-r1.ebuild | 12 ++++- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/app-accessibility/flite/files/flite-2.2-make-4.4.patch b/app-accessibility/flite/files/flite-2.2-make-4.4.patch new file mode 100644 index 000000000000..21c2f866f5fc --- /dev/null +++ b/app-accessibility/flite/files/flite-2.2-make-4.4.patch @@ -0,0 +1,60 @@ +https://github.com/festvox/flite/issues/86 +https://github.com/festvox/flite/pull/92 + +From 14aa28529357ba13994a2bd90cfd11bfceeffcce Mon Sep 17 00:00:00 2001 +From: Moritz Barsnick <barsn...@gmx.net> +Date: Thu, 23 Mar 2023 14:53:08 +0100 +Subject: [PATCH] fix implicit dependency on flite_voice_list.c + +Also make flite_lang_list a proper rule, so that it only builds once. + +Both C files were repeatedly being clobbered, as were their respective +object files. + +Convert flite_voice_list.c is into an explicit dependency with a creation +rule. flite_voice_list.o continues to be implicit from flite_voice_list.c. + +Convert flite_lang_list into a similar, proper object rule. + +Fixes https://github.com/festvox/flite/issues/86 +--- a/main/Makefile ++++ b/main/Makefile +@@ -106,21 +106,16 @@ endif + + .NOTPARALLEL: $(ALL) + +-flite_lang_list: +- rm -f flite_lang_list.c ++flite_lang_list.c: + $(TOP)/tools/make_lang_list $(LANGS) $(LEXES) +- $(MAKE) flite_lang_list.o + +-$(BINDIR)/flite$(EXEEXT): flite_main.o flite_lang_list $(flite_LIBS_deps) ++flite_voice_list.c: + $(TOP)/tools/make_voice_list $(VOICES) +- rm -f flite_voice_list.o +- $(MAKE) flite_voice_list.o ++ ++$(BINDIR)/flite$(EXEEXT): flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps) + $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS) + +-$(BINDIR)/flitevox_info$(EXEEXT): flitevox_info_main.o flite_lang_list $(flite_LIBS_deps) +- $(TOP)/tools/make_voice_list $(VOICES) +- rm -f flite_voice_list.o +- $(MAKE) flite_voice_list.o ++$(BINDIR)/flitevox_info$(EXEEXT): flitevox_info_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps) + $(CC) $(CFLAGS) -o $@ flitevox_info_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS) + + $(BINDIR)/world$(EXEEXT): world_main.c +@@ -144,10 +139,7 @@ each: + $(MAKE) VOICE=$$i $(BINDIR)/flite_$$i ; \ + done + +-$(BINDIR)/flite_${VOICE}: flite_main.o flite_lang_list $(flite_LIBS_deps) +- $(TOP)/tools/make_voice_list $(VOICE) +- rm -f flite_voice_list.o +- $(MAKE) flite_voice_list.o ++$(BINDIR)/flite_${VOICE}: flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_deps) + $(CC) $(CFLAGS) -o $@ flite_main.o flite_voice_list.o flite_lang_list.o $(flite_LIBS_flags) $(LDFLAGS) + + install: diff --git a/app-accessibility/flite/flite-2.2-r1.ebuild b/app-accessibility/flite/flite-2.2-r1.ebuild index 5c91935f7dc3..835c173da379 100644 --- a/app-accessibility/flite/flite-2.2-r1.ebuild +++ b/app-accessibility/flite/flite-2.2-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools multilib-minimal toolchain-funcs +inherit autotools flag-o-matic multilib-minimal toolchain-funcs DESCRIPTION="Flite text to speech engine" HOMEPAGE="http://www.festvox.org/flite/ https://github.com/festvox/flite"; @@ -58,6 +58,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.4-audio-interface.patch "${FILESDIR}"/${PN}-2.2-backport-pr30.patch + "${FILESDIR}"/${PN}-2.2-make-4.4.patch ) get_audio() { @@ -105,6 +106,13 @@ src_prepare() { multilib_copy_sources } +src_configure() { + # lto-type-mismatch + filter-lto + + multilib-minimal_src_configure +} + multilib_src_configure() { local myconf=( --enable-shared
