From 06d4a5427bc67c85058f93727bd9c6d9b80cc81b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 9 Feb 2019 17:37:06 -0800 Subject: espeak: Generate phondata based on endianness of targer Use qemu usermode to generate it, so we are always in correct endian-ness espeak-data is no longer needed now, since sole purpose of it was to provide the data for bigendian systems Signed-off-by: Khem Raj --- ...languages-cast-string_ordinal-init-values.patch | 34 ++++++++++++++++++++++ .../espeak/files/espeak-1.48-gcc-6-fix.patch | 12 -------- 2 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch delete mode 100644 meta-oe/recipes-support/espeak/files/espeak-1.48-gcc-6-fix.patch (limited to 'meta-oe/recipes-support/espeak/files') diff --git a/meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch b/meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch new file mode 100644 index 0000000000..cef360eaef --- /dev/null +++ b/meta-oe/recipes-support/espeak/files/0002-tr_languages-cast-string_ordinal-init-values.patch @@ -0,0 +1,34 @@ +From 451330d09a6a3500b40bc4f5896ba790ab46cd6c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 15 Jan 2017 19:37:31 +0100 +Subject: [PATCH 2/2] tr_languages: cast string_ordinal init values + +On some architecture, "char" is signed (x86_64, nios2...) so the +compiler try to convert int 0xc2 and 0xba to a signed char. +This is an error since gcc6 (Wnarrowing). + +Fixes: +http://autobuild.buildroot.net/results/bae/baef9888b1979d18171668a675985e3f3b45fda6 + +Upstream-Status: Pending [imported from BR] +Signed-off-by: Romain Naour +--- + src/tr_languages.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp +index 5c80286..dbc6e36 100644 +--- a/src/tr_languages.cpp ++++ b/src/tr_languages.cpp +@@ -200,7 +200,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { + 0x200d, 1, // zero width joiner + 0, 0 }; + +-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 ++const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8 + + + static Translator* NewTranslator(void) +-- +2.9.3 + diff --git a/meta-oe/recipes-support/espeak/files/espeak-1.48-gcc-6-fix.patch b/meta-oe/recipes-support/espeak/files/espeak-1.48-gcc-6-fix.patch deleted file mode 100644 index 6e59c7892f..0000000000 --- a/meta-oe/recipes-support/espeak/files/espeak-1.48-gcc-6-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp ---- a/src/tr_languages.cpp -+++ b/src/tr_languages.cpp -@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { - 0x200d, 1, // zero width joiner - 0, 0 }; - --const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 -+const char string_ordinal[] = {'\xc2','\xba',0}; // masculine ordinal character, UTF-8 - - - static Translator* NewTranslator(void) -- cgit 1.2.3-korg