summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.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/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.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/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
new file mode 100644
index 00000000..34761950
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -0,0 +1,56 @@
1From 8f16cec0583c9de1ceb2c34a3bea527096f34075 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Sep 2018 12:59:05 -0700
4Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get
5 __WORDSIZE on musl libc
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 chromium/third_party/breakpad/breakpad/configure.ac | 2 +-
11 .../breakpad/breakpad/src/common/dwarf/elf_reader.cc | 3 ++-
12 .../breakpad/breakpad/src/common/linux/elf_core_dump.h | 1 +
13 3 files changed, 4 insertions(+), 2 deletions(-)
14
15diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac
16index 492d09038f9..a6403ed8c3c 100644
17--- a/chromium/third_party/breakpad/breakpad/configure.ac
18+++ b/chromium/third_party/breakpad/breakpad/configure.ac
19@@ -72,7 +72,7 @@ AC_ARG_ENABLE(m32,
20 AC_HEADER_STDC
21 AC_SYS_LARGEFILE
22 AX_PTHREAD
23-AC_CHECK_HEADERS([a.out.h sys/random.h])
24+AC_CHECK_HEADERS([a.out.h sys/random.h sys/reg.h])
25 AC_CHECK_FUNCS([arc4random getrandom])
26
27 AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
28diff --git a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
29index 4135a51a980..be92b792d3c 100644
30--- a/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
31+++ b/chromium/third_party/breakpad/breakpad/src/common/dwarf/elf_reader.cc
32@@ -29,10 +29,11 @@
33 #ifndef _GNU_SOURCE
34 #define _GNU_SOURCE // needed for pread()
35 #endif
36-
37+#include <config.h>
38 #include <sys/types.h>
39 #include <sys/stat.h>
40 #include <sys/mman.h>
41+#include <sys/reg.h>
42 #include <unistd.h>
43 #include <fcntl.h>
44 #include <string.h>
45diff --git a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
46index d03c7a88d38..28b55ab6300 100644
47--- a/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
48+++ b/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h
49@@ -33,6 +33,7 @@
50 #ifndef COMMON_LINUX_ELF_CORE_DUMP_H_
51 #define COMMON_LINUX_ELF_CORE_DUMP_H_
52
53+#include <sys/reg.h>
54 #include <elf.h>
55 #include <link.h>
56 #include <stddef.h>