From dbd07446e02da51c9ea8fe6543ad156a9c656069 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 31 Jan 2019 09:24:47 +0200 Subject: 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 --- meta-boot2qt-distro/recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 3 +++ scripts/manifest.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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() { } SRC_URI_append_mingw32 = "file://0001-disable-qt_random_cpu.patch" + +# qdatetime.cpp: error: 'localtime_r' was not declared in this scope +QT_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 @@ path="sources/meta-qt5"/>