diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-23 15:55:46 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-30 08:11:51 +0000 |
commit | bfddeb7f34db5b1d1b73a787246ca28f8ad3575b (patch) | |
tree | ad8d7e0e85bbf25772fe0a3d35e8c0045e23f336 /recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |
parent | 11b63656bad9db24950d05901a8b1917bc5cb7f8 (diff) | |
download | meta-qt5-bfddeb7f34db5b1d1b73a787246ca28f8ad3575b.tar.gz |
qtwebengine: update chromium musl patchset
Change-Id: I792a600e354531f234a3ff641c030c119921f200
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index f0627f56..b1b9f076 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e78ef57ef202bcf101a2dadb694ab38f02927151 Mon Sep 17 00:00:00 2001 | 1 | From c071a51e75e370c432bf4348fdda2b794927c896 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 | 3 | Date: Fri, 7 Jul 2017 15:09:02 -0700 |
4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols | 4 | Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols |
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc | 12 | diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc |
13 | index 4b7de5e1a3..fe565223f2 100644 | 13 | index e919f094c3..414a21d32a 100644 |
14 | --- a/chromium/base/allocator/allocator_shim.cc | 14 | --- a/chromium/base/allocator/allocator_shim.cc |
15 | +++ b/chromium/base/allocator/allocator_shim.cc | 15 | +++ b/chromium/base/allocator/allocator_shim.cc |
16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { | 16 | @@ -302,7 +302,7 @@ ALWAYS_INLINE void ShimFreeDefiniteSize(void* ptr, size_t size, void* context) { |