summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:42:26 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-01-13 15:57:32 +0200
commitf6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch)
treed0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
parent9ff0a36249205d36bb44cc34a26cb6201180a89f (diff)
parent1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff)
downloadmeta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits) qtbase: Use pcre packages by default qt5: use PACKAGECONFIG to disable tests and examples qtlocation: use geoclue 2 qtbase: use offscreen platform plugin for tools qtbase: add openssl PACKAGECONFIG for native nativesdk qtbase-native: disable vulkan support maliit-framework-qt5: fix test installations qtenginio: remove obsolete module ogl-runtime: update to v2.5.0 release qtquick3d: add recipe qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance qt5: Update to Qt 5.14.0 qtbase: Fix patch fuzz detected with devtool qtbase: Backport the patch from upstream gerrit qt5-creator: Update musl patch to link qmldesigner with -lexecinfo qtwebengine: Move CharAllocator definition to header qt5-creator: Add missing dep on libz.so qt5-creator: Make clang-format patch work with multiple clang versions qtwebengine: Include cstddef for size_t definition ... Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
new file mode 100644
index 00000000..ad7a085f
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -0,0 +1,62 @@
1From 5cde4d2fb5affc6e739dba412453b4bf076f19e9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:38:37 -0700
4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
5
6- only do the glibc 32-bit ABI check for mmap/mmap64 on gnu libc. musl
7 does not support the 32-bit ABI.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 .../tcmalloc/chromium/src/malloc_hook_mmap_linux.h | 10 +++++-----
12 1 file changed, 5 insertions(+), 5 deletions(-)
13
14diff --git a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
15index 17415aaf538..59c1b6fb5f6 100644
16--- a/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
17+++ b/chromium/third_party/tcmalloc/chromium/src/malloc_hook_mmap_linux.h
18@@ -60,7 +60,7 @@
19
20 static inline void* do_mmap64(void *start, size_t length,
21 int prot, int flags,
22- int fd, __off64_t offset) __THROW {
23+ int fd, off64_t offset) __THROW {
24 // The original gperftools uses sys_mmap() here. But, it is not allowed by
25 // Chromium's sandbox.
26 return (void*)syscall(SYS_mmap, start, length, prot, flags, fd, offset);
27@@ -73,7 +73,7 @@ static inline void* do_mmap64(void *start, size_t length,
28
29 static inline void* do_mmap64(void *start, size_t length,
30 int prot, int flags,
31- int fd, __off64_t offset) __THROW {
32+ int fd, off64_t offset) __THROW {
33 void *result;
34
35 // Try mmap2() unless it's not supported
36@@ -144,7 +144,7 @@ static inline void* do_mmap64(void *start, size_t length,
37
38 extern "C" {
39 void* mmap64(void *start, size_t length, int prot, int flags,
40- int fd, __off64_t offset ) __THROW
41+ int fd, off64_t offset ) __THROW
42 ATTRIBUTE_SECTION(malloc_hook);
43 void* mmap(void *start, size_t length,int prot, int flags,
44 int fd, off_t offset) __THROW
45@@ -159,7 +159,7 @@ extern "C" {
46 }
47
48 extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
49- int fd, __off64_t offset) __THROW {
50+ int fd, off64_t offset) __THROW {
51 MallocHook::InvokePreMmapHook(start, length, prot, flags, fd, offset);
52 void *result;
53 if (!MallocHook::InvokeMmapReplacement(
54@@ -170,7 +170,7 @@ extern "C" void* mmap64(void *start, size_t length, int prot, int flags,
55 return result;
56 }
57
58-# if !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)
59+# if defined(__GLIBC__) && (!defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH))
60
61 extern "C" void* mmap(void *start, size_t length, int prot, int flags,
62 int fd, off_t offset) __THROW {