summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 6aa8c160..40c7c3da 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,6 +26,9 @@ SRC_URI += "\
26 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 26 file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
27 file://0007-Delete-qlonglong-and-qulonglong.patch \ 27 file://0007-Delete-qlonglong-and-qulonglong.patch \
28 file://0008-Replace-pthread_yield-with-sched_yield.patch \ 28 file://0008-Replace-pthread_yield-with-sched_yield.patch \
29 file://0010-Add-OE-specific-specs-for-clang-compiler.patch \
30 file://0011-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
31 file://0012-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
29 file://run-ptest \ 32 file://run-ptest \
30" 33"
31 34
@@ -160,6 +163,9 @@ QT_CONFIG_FLAGS += " \
160# since we cannot set empty set filename to a not existent file 163# since we cannot set empty set filename to a not existent file
161deltask generate_qt_config_file 164deltask generate_qt_config_file
162 165
166XPLATFORM_toolchain-clang = "linux-oe-clang"
167XPLATFORM ?= "linux-oe-g++"
168
163do_configure() { 169do_configure() {
164 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration 170 # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration
165 touch ${S}/mkspecs/oe-device-extra.pri 171 touch ${S}/mkspecs/oe-device-extra.pri
@@ -188,7 +194,7 @@ do_configure() {
188 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \ 194 -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
189 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \ 195 -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
190 -platform ${OE_QMAKE_PLATFORM_NATIVE} \ 196 -platform ${OE_QMAKE_PLATFORM_NATIVE} \
191 -xplatform linux-oe-g++ \ 197 -xplatform ${XPLATFORM} \
192 ${QT_CONFIG_FLAGS} 198 ${QT_CONFIG_FLAGS}
193} 199}
194 200