diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-21 21:01:40 +0000 |
commit | c8d5ef50d52bee6d8fc691cf08dcd0210ab14ce0 (patch) | |
tree | 821445c6e1fe46948cd9fba26480ed359288b545 /recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |
parent | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (diff) | |
download | meta-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/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch new file mode 100644 index 00000000..9909563a --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-musl-use-off64_t-instead-of-the-internal-__.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 5dd17cac121ff55167f8fd049e1935b5f80d5b33 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 7 Jul 2017 14:38:37 -0700 | ||
4 | Subject: [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 | |||
9 | Signed-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 | |||
14 | diff --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 | ||
15 | index 2f6116fa45c..7486a05a272 100755 | ||
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 | return sys_mmap(start, length, prot, flags, fd, offset); | ||
25 | } | ||
26 | |||
27 | @@ -71,7 +71,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 | @@ -142,7 +142,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 | @@ -157,7 +157,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 | @@ -168,7 +168,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 { | ||