aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase_git.bb
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2019-04-14 13:59:30 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2019-05-30 12:21:03 +0000
commit1520d5b2b2beec5e1c3209d3178219e93ef08bca (patch)
tree03207eb1a44e71a1a6be54ebcf90af2c3302f323 /recipes-qt/qt5/qtbase_git.bb
parent0630018c0033c91fddda62a49f59a82ba6ec6850 (diff)
qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This causes massive failures at do_install [2] on qtbase. To work around tell Qt build configuration not to use ranameat2 independent of glibc version. Target qtbase does not require this adjustment - there is no pseudo on target. [1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 [2] https://github.com/meta-qt5/meta-qt5/issues/187 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/qtbase_git.bb15
1 files changed, 7 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 67aa4c3b..ca8de801 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.13
+# 5.11.meta-qt5-shared.14
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -29,13 +29,12 @@ SRC_URI += "\
file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
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 \
- file://0018-corelib-Include-sys-types.h-for-uint32_t.patch \
- file://0019-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
- file://0020-Fix-compile-issue-with-gcc-9.patch \
+ file://0014-double-conversion-support-AARCH64EB-and-arm-BE.patch \
+ file://0015-Disable-ltcg-for-host_build.patch \
+ file://0016-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
+ file://0017-corelib-Include-sys-types.h-for-uint32_t.patch \
+ file://0018-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
+ file://0019-Fix-compile-issue-with-gcc-9.patch \
"