diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:42:33 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 12:03:36 +0000 |
commit | 6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch) | |
tree | 377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |
parent | b84881444814a361fcc17e7eb34407fb175541da (diff) | |
parent | 40054db1de152d85c22aefdae50b136ca56967c5 (diff) | |
download | meta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
40054db qt5: qtbase: Upgrade Double-Conversion
dd1ce3c README: Rework to start using GitHub for development
ef5f5d9 qt5: upgrade to 5.11.1
820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
e199d80 python-pyqt5: update recipe to 5.10.1
65db89e qtbase: don't pass empty filename to function
3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
a36cc5f libvcard: add recipe
1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
557aabd qttranslations: remove qtquick1 translation package
00aafa0 qt5-creator: Remove qtquick1 dependency
731334a qtwebengine: fix build with plugins as well as ozone enabled
70ce980 qtwebengine: add -fpermissive
33f58ff qtwebengine: fix build with gcc8, part II
267a38f qtwebengine: fix build with gcc8
7193a7f qtquick1: remove recipe and all references
29445f6 qtwebkit: do not skip build - use cmake as build system
dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
e0a4e23 qt5: Update to Qt 5.11.0
73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend
Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-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/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch new file mode 100644 index 00000000..f36f0902 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 6dec716e02e46bc75230b01aafb115f35fd3a895 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 | } | ||