diff options
author | Lei Maohui <leimaohui@cn.fujitsu.com> | 2018-08-30 10:58:18 +0900 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | 81239229dfda6d9a4b72dc44245fdfb9f10e6fcb (patch) | |
tree | c18d033022c3dde75a8155f040923772748f26ad /recipes-qt/qt5/qtbase-native_git.bb | |
parent | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (diff) | |
download | meta-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/qtbase-native_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
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 | |||
18 | 18 | ||
19 | # common for qtbase-native, qtbase-nativesdk and qtbase | 19 | # common for qtbase-native, qtbase-nativesdk and qtbase |
20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared | 20 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-shared |
21 | # 5.11.meta-qt5-shared.8 | 21 | # 5.11.meta-qt5-shared.9 |
22 | SRC_URI += "\ | 22 | SRC_URI += "\ |
23 | file://0001-Add-linux-oe-g-platform.patch \ | 23 | file://0001-Add-linux-oe-g-platform.patch \ |
24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ | 24 | file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ |
@@ -34,18 +34,19 @@ SRC_URI += "\ | |||
34 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ | 34 | file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ |
35 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ | 35 | file://0013-Upgrade-double-conversion-to-v3.0.0.patch \ |
36 | file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ | 36 | file://0014-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ |
37 | file://0015-double-conversion-support-AARCH64EB-and-arm-BE.patch \ | ||
37 | " | 38 | " |
38 | 39 | ||
39 | # common for qtbase-native and nativesdk-qtbase | 40 | # common for qtbase-native and nativesdk-qtbase |
40 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native | 41 | # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native |
41 | # 5.11.meta-qt5-native.8 | 42 | # 5.11.meta-qt5-native.9 |
42 | SRC_URI += " \ | 43 | SRC_URI += " \ |
43 | file://0015-Always-build-uic-and-qvkgen.patch \ | 44 | file://0016-Always-build-uic-and-qvkgen.patch \ |
44 | " | 45 | " |
45 | 46 | ||
46 | # only for qtbase-native | 47 | # only for qtbase-native |
47 | SRC_URI += " \ | 48 | SRC_URI += " \ |
48 | file://0016-Bootstrap-without-linkat-feature.patch \ | 49 | file://0017-Bootstrap-without-linkat-feature.patch \ |
49 | " | 50 | " |
50 | 51 | ||
51 | CLEANBROKEN = "1" | 52 | CLEANBROKEN = "1" |