From 8895ea3b63c7ab959794acef93548c1c9df9307e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 14 Apr 2019 13:59:30 +0200 Subject: qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index cf92b3a2..a9bdac4a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -37,18 +37,18 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ 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-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ - file://0014-Disable-ltcg-for-host_build.patch \ - file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0013-Disable-ltcg-for-host_build.patch \ + file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native # 5.12.meta-qt5-native.6 SRC_URI += " \ - file://0018-Always-build-uic-and-qvkgen.patch \ + file://0017-Always-build-uic-and-qvkgen.patch \ + file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase -- cgit v1.2.3