commit: f985280037cfd519f8bf8b0d74e3063c6eeb7d51
Author: Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sat Nov 28 08:05:55 2020 +0000
Commit: Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Nov 28 08:05:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f9852800
app-accessibility/mimic1: fix GCC 10 building
multiple definition of `cst_rx_not_indic'
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
.../mimic1/files/mimic1-1.3.0.1-gcc10.patch | 25 ++++++++++++++++++++++
app-accessibility/mimic1/mimic1-1.3.0.1.ebuild | 6 +++---
app-accessibility/mimic1/mimic1-9999.ebuild | 6 +++---
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/app-accessibility/mimic1/files/mimic1-1.3.0.1-gcc10.patch
b/app-accessibility/mimic1/files/mimic1-1.3.0.1-gcc10.patch
new file mode 100644
index 00000000..e2b30f11
--- /dev/null
+++ b/app-accessibility/mimic1/files/mimic1-1.3.0.1-gcc10.patch
@@ -0,0 +1,25 @@
+From 55cbf5bc28c32cfe66cb746e00c10be4f2537a1d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.k...@gmail.com>
+Date: Wed, 12 Aug 2020 16:47:27 -0700
+Subject: [PATCH] cmu_indic_lang: Make cst_rx_not_indic as extern declaration
+
+Fixes build with gcc-10 which has -fno-common turned on by default
+
+Signed-off-by: Khem Raj <raj.k...@gmail.com>
+---
+ lang/cmu_indic_lang/cmu_indic_lang.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h
b/lang/cmu_indic_lang/cmu_indic_lang.h
+index 75ee46c..83e2afa 100644
+--- a/lang/cmu_indic_lang/cmu_indic_lang.h
++++ b/lang/cmu_indic_lang/cmu_indic_lang.h
+@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v);
+ extern const cst_phoneset cmu_indic_phoneset;
+ extern const cst_cart cmu_indic_phrasing_cart;
+
+-const cst_regex * const cst_rx_not_indic;
++extern const cst_regex * const cst_rx_not_indic;
+
+ #ifdef __cplusplus
+ } /* extern "C" */
diff --git a/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
b/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
index 5d07fcc4..b6c8eb15 100644
--- a/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
+++ b/app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit autotools
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/MycroftAI/mimic1.git";
else
@@ -31,10 +31,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
+
src_prepare() {
default
-
sed -i 's/-Werror//' Makefile.am
-
eautoreconf
}
diff --git a/app-accessibility/mimic1/mimic1-9999.ebuild
b/app-accessibility/mimic1/mimic1-9999.ebuild
index 5d07fcc4..562221b1 100644
--- a/app-accessibility/mimic1/mimic1-9999.ebuild
+++ b/app-accessibility/mimic1/mimic1-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit autotools
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/MycroftAI/mimic1.git";
else
@@ -31,10 +31,10 @@ DEPEND="
RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${PN}-1.3.0.1-gcc10.patch" )
+
src_prepare() {
default
-
sed -i 's/-Werror//' Makefile.am
-
eautoreconf
}
