summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-12-20 01:05:55 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-12-21 21:01:40 +0000
commitc8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch)
tree821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
parentc6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff)
downloadmeta-qt5-c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0.tar.gz
qt5: upgrade to latest revision in 5.12
* WIP * zlib temporarily disabled in qtbase-native, the configure fails too find it even when it is in RSS: docker-shr qemux86-64@ ~/build/oe-core $ find /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0 -name zlib\* /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/freetype/src/gzip/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib/src/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/git/src/3rdparty/zlib_dependency.pri /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/lib/pkgconfig/zlib.pc /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/usr/include/zlib.h /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/sysroot-providers/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.2dcdd26b684916aff89d13cb1c919939 /OE/build/oe-core/tmp-glibc/work/x86_64-linux/qtbase-native/5.12.0+gitAUTOINC+7fc427ba23-r0/recipe-sysroot-native/installeddeps/zlib-native.complete ERROR: Feature 'system-zlib' was enabled, but the pre-condition 'libs.zlib' failed. * fixes #136 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0013-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/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
new file mode 100644
index 00000000..49106762
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch
@@ -0,0 +1,56 @@
1From e6ff3e4d84b459a0d74818d0c9d842d6d485f5c4 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 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)
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>