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/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.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/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch new file mode 100644 index 00000000..dbcf4b82 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 4b2ee08e04f3012ace2906879eadf0919a1c8d73 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Tue, 12 Dec 2017 16:06:14 +0200 | ||
4 | Subject: [PATCH] musl: don't use pvalloc as it's not available on musl | ||
5 | |||
6 | Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 | ||
7 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
8 | --- | ||
9 | src/core/api/qtbug-61521.cpp | 8 -------- | ||
10 | 1 file changed, 8 deletions(-) | ||
11 | |||
12 | diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp | ||
13 | index 002a1af2..8fd2da36 100644 | ||
14 | --- a/src/core/api/qtbug-61521.cpp | ||
15 | +++ b/src/core/api/qtbug-61521.cpp | ||
16 | @@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); | ||
17 | void* __valloc(size_t size) | ||
18 | SHIM_ALIAS_SYMBOL(ShimValloc); | ||
19 | |||
20 | -SHIM_SYMBOL_VERSION(pvalloc); | ||
21 | -void* __pvalloc(size_t size) | ||
22 | - SHIM_ALIAS_SYMBOL(ShimPvalloc); | ||
23 | - | ||
24 | SHIM_SYMBOL_VERSION(posix_memalign); | ||
25 | int __posix_memalign(void** r, size_t a, size_t s) | ||
26 | SHIM_ALIAS_SYMBOL(ShimPosixMemalign); | ||
27 | @@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { | ||
28 | return valloc(size); | ||
29 | } | ||
30 | |||
31 | -SHIM_HIDDEN void* ShimPvalloc(size_t size) { | ||
32 | - return pvalloc(size); | ||
33 | -} | ||
34 | - | ||
35 | SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { | ||
36 | return posix_memalign(r,a,s); | ||
37 | } | ||