summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-01-31 09:24:47 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-02-01 06:58:41 +0000
commitdbd07446e02da51c9ea8fe6543ad156a9c656069 (patch)
tree85cec18e181e91261c02b108a0c0617f5d20e606
parent12f3a11c1930152c17c70e34dc01c80feca20333 (diff)
downloadmeta-boot2qt-dbd07446e02da51c9ea8fe6543ad156a9c656069.tar.gz
mingw: update meta-mingw layer and fix qtbase build
Thud branch is missing some of the fixes required for cmake, so use sha1 from master branch. This needs a fix for for nativesdk-qtbase as mingw64 headers have conflict depending on which order time.h and pthread.h are included, causing error: "qdatetime.cpp: error: 'localtime_r' was not declared in this scope" Change-Id: Ie3faf69302594c1bead3bd0a5cc4bb2205c587ea Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend3
-rw-r--r--scripts/manifest.xml2
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 36b4409..df45875 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -46,3 +46,6 @@ fakeroot do_generate_qt_environment_file_mingw32() {
46} 46}
47 47
48SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" 48SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch"
49
50# qdatetime.cpp: error: 'localtime_r' was not declared in this scope
51QT_CONFIG_FLAGS_append_mingw32 = " -D_POSIX_C_SOURCE"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 64f6bcc..b39cba4 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -30,7 +30,7 @@
30 path="sources/meta-qt5"/> 30 path="sources/meta-qt5"/>
31 <project name="meta-mingw" 31 <project name="meta-mingw"
32 remote="qtyocto" 32 remote="qtyocto"
33 revision="628dcfed62ce8dcc408e5b4a5e5c0aaa921b20ad" 33 revision="fa4ea76d93c87a2ad3ce88b052c282106b2761e4"
34 path="sources/meta-mingw"/> 34 path="sources/meta-mingw"/>
35 35
36 <project name="meta-freescale" 36 <project name="meta-freescale"