mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-10 15:45:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

app-accessibility/mimic1: fix GCC 10 building

Browse Source 
multiple definition of `cst_rx_not_indic'

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans@posteo.de>
This commit is contained in:
Theo Anderson
2020-11-28 21:05:55 +13:00
parent f553050324
commit f985280037
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app-accessibility/mimic1/files/mimic1-1.3.0.1-gcc10.patch Normal file
View File

@@ -0,0 +1,25 @@
From 55cbf5bc28c32cfe66cb746e00c10be4f2537a1d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@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.khem@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" */

6
app-accessibility/mimic1/mimic1-1.3.0.1.ebuild
View File

@@ -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
}

6
app-accessibility/mimic1/mimic1-9999.ebuild
View File

@@ -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
}