diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-15 12:10:22 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-11-15 15:44:01 +0200 |
| commit | ff6127ddd318d422f595295d1c189a86b3032873 (patch) | |
| tree | f3c25ef68a18af1658229c5e5dc2687456809fe0 /recipes-qt/qt5/qtbase_git.bb | |
| parent | 6b354b933c526015c1c98e2334cdb29cb5e489e1 (diff) | |
| parent | fd1f0f47312e7ee80e5ca65b8b2992cb068b1656 (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
fd1f0f4 python-pyqt5: Update to 5.11.3 and add python3 recipe.
3fa1993 qtbase-native: disable postgresql support
0edbe1b qtbase: refresh patches and update tags on meta-qt5
4ed4385 qtbase: don't leak absolut path to recipe specific sysroot
b3502fb qt5: Disable ltcg for host_build
5832bf2 qtbase: don't use thumb for armv[45]
Task-number: QTBUG-71658
Change-Id: Ied518deb11fb41e9f91c58419a6efee37a4086d4
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 60ed2971..76f776f5 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared -# 5.11.meta-qt5-shared.11 +# 5.11.meta-qt5-shared.12 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -31,6 +31,8 @@ SRC_URI += "\ file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ + file://0016-Disable-ltcg-for-host_build.patch \ + file://0017-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ " @@ -173,6 +175,11 @@ deltask generate_qt_config_file XPLATFORM_toolchain-clang = "linux-oe-clang" XPLATFORM ?= "linux-oe-g++" +# Causes qdrawhelper.s: Error: unaligned opcodes detected in executable segment +# when building qtbase/5.6.3+gitAUTOINC+e6f8b072d2-r0/git/src/gui/painting/qdrawhelper.cpp +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + do_configure() { # Regenerate header files when they are included in source tarball # Otherwise cmake files don't set PRIVATE_HEADERS correctly |