diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-01 14:13:29 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-06 10:00:38 +0200 |
commit | 270fb283c271f24eee7d9f5b45ff29066865b923 (patch) | |
tree | 09c704b697424bc1afbdb5e62da879ac9047213d /recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | |
parent | ed327d9cd97c0996e0875b0c03f86cbd76232977 (diff) | |
parent | 439f7be65f681d4e45f30571082e38791cca2ef2 (diff) | |
download | meta-qt5-270fb283c271f24eee7d9f5b45ff29066865b923.tar.gz |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
439f7be qt5: update submodules
c8c8613 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
6231201 qt5: update submodules
4428b0c qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
fb71293 qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch
38ec325 qwt-qt5: upgrade 6.1.3 -> 6.1.4
e2d9845 qwt-qt5: Fix multilib install
5be2654 qtwebengine: Fix build with clang/libc++ on aarch64/arm
cb1b472 qtbase: Export host compiler and linker
6d919b0 qt5-plugin-generic-vboxtouch: Fix build with clang/libc++
6713882 maliit-framework,maliit-plugins: Fix build with libc++
9a83f2d qtconnectivity: Fix build with clang/libc++
080cc29 qtwayland: workaround upstream bug: install missing headers manually
356ff00 qt5: update submodules
f6f61b0 gstreamer1.0-plugins-good: fix qt5 dependency
d055d6a qtbase: Update the PACKAGECONFIG_KDE to enable more
7935b6b qt5: update submodules
b9131d6 qt5: update submodules
0f27849 qt5: update submodules
70e4a1c qt5: update submodules
82abc2b qtbase: fix incomplete recipe changes from previous commit
f4c8cef qtbase: Fix qtopcua issue on bigendian systems
be8bc9f qtwebkit: Disable JIT for mips64
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qt5-git.inc
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtcanvas3d_git.bb
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdatavis3d_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtgamepad_git.bb
recipes-qt/qt5/qtgraphicaleffects_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtknx_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmqtt_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtnetworkauth_git.bb
recipes-qt/qt5/qtopcua_git.bb
recipes-qt/qt5/qtpurchasing_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtremoteobjects_git.bb
recipes-qt/qt5/qtscript_git.bb
recipes-qt/qt5/qtscxml_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsvg_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtvirtualkeyboard_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebchannel_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtwebglplugin_git.bb
recipes-qt/qt5/qtwebsockets_git.bb
recipes-qt/qt5/qtwebview_git.bb
recipes-qt/qt5/qtx11extras_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: If04e8cc63c0352c0811712bbd5d0c894a40628e4
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch new file mode 100644 index 00000000..392fb5a7 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From af02d2c093b870d3c8b751d0cb573a797f46ccb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 5 Feb 2019 14:32:20 -0800 | ||
4 | Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm | ||
5 | |||
6 | This fixes build issues during cross compiling for linux using clang | ||
7 | |||
8 | Fixes | ||
9 | src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to `__crc32d' | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | chromium/third_party/zlib/BUILD.gn | 5 ++++- | ||
15 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn | ||
18 | index 6aca13e..bd49d99 100644 | ||
19 | --- a/chromium/third_party/zlib/BUILD.gn | ||
20 | +++ b/chromium/third_party/zlib/BUILD.gn | ||
21 | @@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { | ||
22 | # - ChromeOS has wrapper scripts that are borking the compiler flags. | ||
23 | # - Fuchsia just added a syscall for feature detection. | ||
24 | # TODO(cavalcantii): crbug.com/810125. | ||
25 | + defines = [] | ||
26 | if (is_clang && (!is_ios && !is_chromeos && !is_fuchsia)) { | ||
27 | - defines = [ "CRC32_ARMV8_CRC32" ] | ||
28 | + if (current_cpu == "arm64") { | ||
29 | + defines += [ "CRC32_ARMV8_CRC32" ] | ||
30 | + } | ||
31 | if (is_android) { | ||
32 | defines += [ "ARMV8_OS_ANDROID" ] | ||
33 | } else if (is_linux || is_chromeos) { | ||