[yocto] [meta-qt4][PATCH 1/2] qt4-4.8.7.inc: use a supported builtin type for Uchar

Max Krummenacher max.oss.09 at gmail.com
Thu Sep 14 05:09:23 PDT 2017


cope with icu 59's changed use of uchar.
http://site.icu-project.org/download/59#TOC-ICU4C-char16_t

4.8.7-r0/recipe-sysroot/usr/include/unicode/umachine.h:347:13: error: 'char16_t' does not name a type; did you mean 'wchar_t'?
     typedef char16_t UChar;
             ^~~~~~~~
             wchar_t
...
4.8.7-r0/recipe-sysroot/usr/include/unicode/uversion.h:167:55: error: 'UChar' does not name a type; did you mean 'UChar32'?
 u_versionFromUString(UVersionInfo versionArray, const UChar *versionString);

Signed-off-by: Max Krummenacher <max.krummenacher at toradex.com>
---
 recipes-qt4/qt4/qt4-4.8.7.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-qt4/qt4/qt4-4.8.7.inc b/recipes-qt4/qt4/qt4-4.8.7.inc
index 4bade85..7720463 100644
--- a/recipes-qt4/qt4/qt4-4.8.7.inc
+++ b/recipes-qt4/qt4/qt4-4.8.7.inc
@@ -46,7 +46,7 @@ UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
 
 # workaround for class std::auto_ptr' is deprecated with gcc-6
-CXXFLAGS += "-std=gnu++98 -Wno-deprecated"
+CXXFLAGS += "-std=gnu++98 -Wno-deprecated -DUCHAR_TYPE=wchar_t"
 
 # disable webkit for mips64 n32 temporarily that fails to compile,
 # qt upstream defect:
-- 
2.9.4




More information about the yocto mailing list