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 | |
parent | f9e80edff01159375b6e03f3cb9ea1f8ed5ced79 (diff) |
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>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 9 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch | 40 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch (renamed from recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch (renamed from recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch) | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 3 |
6 files changed, 53 insertions, 10 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:" # 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 \ @@ -39,13 +39,14 @@ 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.11-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 \ " # CMake's toolchain configuration of nativesdk-qtbase 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" diff --git a/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch new file mode 100644 index 00000000..64e454a2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-double-conversion-support-AARCH64EB-and-arm-BE.patch @@ -0,0 +1,40 @@ +From 3aada36f6706f86b811dafb26e622cd6c99341d6 Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@cn.fujitsu.com> +Date: Wed, 29 Aug 2018 18:20:14 +0900 +Subject: [PATCH] double-conversion: support AARCH64EB and arm BE + +Big endian can work well. So, +- Make qtbase support aarch64 BE +- Make qtbase support arm BE + +Upstream-Status: Pending + +Change-Id: Ie5b104fa2b23af8e89bae57fb56f3663be1bbb48 +Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + .../double-conversion/include/double-conversion/utils.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h +index ca7646d817..69aa17171c 100644 +--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h ++++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h +@@ -68,7 +68,7 @@ inline void abort_noreturn() { abort(); } + // disabled.) + // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) + #if defined(_M_X64) || defined(__x86_64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || _M_ARM_FP || \ ++ defined(__arm__) || defined(__avr32__) || _M_ARM_FP || \ + defined(__hppa__) || defined(__ia64__) || \ + defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ +@@ -76,7 +76,7 @@ inline void abort_noreturn() { abort(); } + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ + defined(__SH4__) || defined(__alpha__) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ +- defined(__AARCH64EL__) || defined(__aarch64__) || \ ++ defined(__AARCH64EL__) || defined(__AARCH64EB__) || defined(__aarch64__) || \ + defined(__riscv) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(__mc68000__) diff --git a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch index e021d0b1..dfef2508 100644 --- a/recipes-qt/qt5/qtbase/0015-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From e590966ce7344a79e6ff0593076fdca5b3ec72c8 Mon Sep 17 00:00:00 2001 +From c6edfce8778d1497383124d5a9ed9cb7b9edb1d4 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch index 7c6787fb..c191a421 100644 --- a/recipes-qt/qt5/qtbase/0016-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From ee9048d24045e2f39a4236557d9247c1cad993a5 Mon Sep 17 00:00:00 2001 +From 365b1b7059d333331a208418b66e9107dc2a4fcc Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 1142097b..72fa2301 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.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 \ @@ -30,6 +30,7 @@ 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 \ " |