From 81239229dfda6d9a4b72dc44245fdfb9f10e6fcb Mon Sep 17 00:00:00 2001 From: Lei Maohui Date: Thu, 30 Aug 2018 10:58:18 +0900 Subject: qtbase: Fix build error for armv8BE multilib. * MJ: modified to apply correctly and to be included in native and nativesdk builds as the comment above SRC_URI says. Signed-off-by: Lei Maohui Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtbase-native_git.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'recipes-qt/qt5/qtbase-native_git.bb') diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a01d19d9..25d0963c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # 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.8 +# 5.11.meta-qt5-shared.9 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -34,18 +34,19 @@ SRC_URI += "\ 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 \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.8 +# 5.11.meta-qt5-native.9 SRC_URI += " \ - file://0015-Always-build-uic-and-qvkgen.patch \ + file://0016-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0016-Bootstrap-without-linkat-feature.patch \ + file://0017-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" -- cgit v1.2.3