[gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/, app-accessibility/flite/files/
commit: 67e62445b8a9e6428f4c6abc67617e013887f078
Author: Sam James gentoo org>
AuthorDate: Mon Mar 4 07:33:19 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 4 07:33:48 2024 +
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 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 ..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
+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
[gentoo-commits] repo/gentoo:master commit in: app-accessibility/flite/, app-accessibility/flite/files/
commit: 4ca5affe87d9c4fca33efefc00f14bedfe3e29b1
Author: Marty E. Plummer startmail com>
AuthorDate: Thu Mar 22 13:14:10 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Mar 26 20:19:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ca5affe
app-accessibility/flite: EAPI bump and patch updates
Bump EAPI to 6 and cleanup the patches a bit
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7588
.../flite/files/flite-1.4-audio-interface.patch| 4 ++--
.../flite/files/flite-1.4-ldflags.patch| 9 -
app-accessibility/flite/flite-1.4-r4.ebuild| 23 +-
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/app-accessibility/flite/files/flite-1.4-audio-interface.patch
b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
index bc8d25b89bc..d50428edd5a 100644
--- a/app-accessibility/flite/files/flite-1.4-audio-interface.patch
+++ b/app-accessibility/flite/files/flite-1.4-audio-interface.patch
@@ -1,5 +1,5 @@
configure.in 2009-08-15 06:46:38.0 +1000
-+++ configure.in 2011-08-30 00:53:26.0 +1000
+--- a/configure.in
b/configure.in
@@ -304,7 +304,6 @@
[ --with-audio with specific audio support (none linux
freebsd etc) ],
AUDIODRIVER=$with_audio )
diff --git a/app-accessibility/flite/files/flite-1.4-ldflags.patch
b/app-accessibility/flite/files/flite-1.4-ldflags.patch
index f9295fb853b..fd8f49059e7 100644
--- a/app-accessibility/flite/files/flite-1.4-ldflags.patch
+++ b/app-accessibility/flite/files/flite-1.4-ldflags.patch
@@ -1,6 +1,5 @@
-diff -Naur flite-1.4-release/config/common_make_rules
flite-1.4-release.new/config/common_make_rules
flite-1.4-release/config/common_make_rules 2009-07-30 14:52:56.0
+
-+++ flite-1.4-release.new/config/common_make_rules 2011-03-26
20:22:59.0 +
+--- a/config/common_make_rules
b/config/common_make_rules
@@ -68,7 +68,7 @@
FLITELIBS = $(BUILDDIR)/lib/libflite.a
@@ -19,8 +18,8 @@ diff -Naur flite-1.4-release/config/common_make_rules
flite-1.4-release.new/conf
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename
$@.${PROJECT_SHLIB_VERSION}` )
@ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}`
`basename $@` )
@ rm -rf shared_os
flite-1.4-release/tools/Makefile~ 2009-08-22 20:19:01.0 +0100
-+++ flite-1.4-release.new/tools/Makefile 2013-01-20 20:06:34.259527220
+
+--- a/tools/Makefile
b/tools/Makefile
@@ -62,9 +62,9 @@
LOCAL_CLEAN = $(BINDIR)/find_sts $(BINDIR)/flite_sort
diff --git a/app-accessibility/flite/flite-1.4-r4.ebuild
b/app-accessibility/flite/flite-1.4-r4.ebuild
index 536b8f83eea..54ce1000b6a 100644
--- a/app-accessibility/flite/flite-1.4-r4.ebuild
+++ b/app-accessibility/flite/flite-1.4-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit autotools eutils multilib-minimal
+EAPI=6
+inherit autotools multilib-minimal
DESCRIPTION="Flite text to speech engine"
HOMEPAGE="http://www.speech.cs.cmu.edu/flite/index.html;
@@ -18,6 +18,14 @@ RDEPEND="${DEPEND}"
S=${WORKDIR}/${P}-release
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4-tempfile.patch
+ "${FILESDIR}"/${PN}-1.4-fix-parallel-builds.patch
+ "${FILESDIR}"/${PN}-1.4-respect-destdir.patch
+ "${FILESDIR}"/${PN}-1.4-ldflags.patch
+ "${FILESDIR}"/${PN}-1.4-audio-interface.patch
+)
+
get_audio() {
if use alsa; then
echo alsa
@@ -29,11 +37,8 @@ get_audio() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-tempfile.patch
- epatch "${FILESDIR}"/${P}-fix-parallel-builds.patch
- epatch "${FILESDIR}"/${P}-respect-destdir.patch
- epatch "${FILESDIR}"/${P}-ldflags.patch
- epatch "${FILESDIR}"/${P}-audio-interface.patch
+ default
+
sed -i main/Makefile \
-e '/-rpath/s|$(LIBDIR)|$(INSTALLLIBDIR)|g' \
|| die
@@ -61,7 +66,7 @@ multilib_src_install_all() {
dodoc ACKNOWLEDGEMENTS README
if ! use static-libs; then
- rm -rf "${D}"/usr/lib*/*.a
+ find "${ED}" -name '*.a' ! -name '*.dll.a' -delete || die
fi
}
