diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:44:26 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-18 15:45:10 +0200 |
commit | 12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch) | |
tree | 5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | |
parent | 3e502778ee161bef4177e7e7f45c0c9b78d047da (diff) | |
parent | 432ad2aa6c3a13253fefc909faba368851d21fb1 (diff) | |
download | meta-qt5-12cc756c7948a90367473f0a52dd2fe2b519dd24.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus:
432ad2a qttools: don't install tst_qtattributionsscanner
8115617 qt5: Upgrade to Qt 5.13.2
267e646 python(3)-pyqt5: add qml support
653e12f libqofono: bump SRCREV and add a fix for voicecall
cefb48e qtbase: Add PACKAGECONFIG for lttng
911b346 layer: Mark zeus as compatible release
c373272 ogl-runtime: Fix build on x86_64
9172ba1 README.md: Document need for 32bit host compiler
db2fd6c qtwayland: Fix build with clang/libc++
6b5122e qtbase: Fix build when fp16 is used
Conflicts:
recipes-qt/qt5/ogl-runtime_git.bb
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwayland_git.bb
Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch new file mode 100644 index 00000000..bb0d13a7 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | From 350739f3986367253e476093eaaa653b7320c54d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 25 Sep 2018 12:59:05 -0700 | ||
4 | Subject: [PATCH] chromium: musl: elf_reader.cc: include <sys/reg.h> to get | ||
5 | __WORDSIZE on musl libc | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | Signed-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 | |||
15 | diff --git a/chromium/third_party/breakpad/breakpad/configure.ac b/chromium/third_party/breakpad/breakpad/configure.ac | ||
16 | index 9cca5aa069c..04139a728cc 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) | ||
28 | diff --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 | ||
29 | index 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> | ||
45 | diff --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 | ||
46 | index 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> | ||