summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/nativesdk-qtbase_git.bb
diff options
context:
space:
mode:
authorLei Maohui <leimaohui@cn.fujitsu.com>2018-08-30 10:58:18 +0900
committerMartin Jansa <Martin.Jansa@gmail.com>2018-09-25 09:34:49 +0000
commit81239229dfda6d9a4b72dc44245fdfb9f10e6fcb (patch)
treec18d033022c3dde75a8155f040923772748f26ad /recipes-qt/qt5/nativesdk-qtbase_git.bb
parentf9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (diff)
downloadmeta-qt5-81239229dfda6d9a4b72dc44245fdfb9f10e6fcb.tar.gz
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 <leimaohui@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index caa2d6ab..ac16e5d8 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
23 23
24# common for qtbase-native, qtbase-nativesdk and qtbase 24# common for qtbase-native, qtbase-nativesdk and qtbase
25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared 25# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared
26# 5.11.meta-qt5-shared.8 26# 5.11.meta-qt5-shared.9
27SRC_URI += "\ 27SRC_URI += "\
28 file://0001-Add-linux-oe-g-platform.patch \ 28 file://0001-Add-linux-oe-g-platform.patch \
29 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 29 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -39,13 +39,14 @@ SRC_URI += "\
39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ 39 file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
40 file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ 40 file://0013-Upgrade-double-conversion-to-v3.0.0.patch \
41 file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ 41 file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \
42 file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \
42" 43"
43 44
44# common for qtbase-native and nativesdk-qtbase 45# common for qtbase-native and nativesdk-qtbase
45# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native 46# Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native
46# 5.11.meta-qt5-native.8 47# 5.11.meta-qt5-native.9
47SRC_URI += " \ 48SRC_URI += " \
48 file://0015-Always-build-uic-and-qvkgen.patch \ 49 file://0016-Always-build-uic-and-qvkgen.patch \
49" 50"
50 51
51# CMake's toolchain configuration of nativesdk-qtbase 52# CMake's toolchain configuration of nativesdk-qtbase