summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-04-17 23:32:56 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-04-18 23:04:41 +0000
commite2707a016c3475c167a421c9c73d88f81cc61bd1 (patch)
treee4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
parent07784245c1822766d54405d835ac2dc08652df1a (diff)
downloadmeta-qt5-e2707a016c3475c167a421c9c73d88f81cc61bd1.tar.gz
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet: qtknx_git.bb:# v5.12.3 tag wasn't created yet qtmqtt_git.bb:# v5.12.3 tag wasn't created yet qtopcua_git.bb:# v5.12.3 tag wasn't created yet * and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch 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.patch37
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..c244a864
--- /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 @@
1From 9409b83e634b53eb59cc0935424ea6fca1f50491 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 12 Dec 2017 16:06:14 +0200
4Subject: [PATCH] musl: don't use pvalloc as it's not available on musl
5
6Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403
7Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
8---
9 src/core/api/qtbug-61521.cpp | 8 --------
10 1 file changed, 8 deletions(-)
11
12diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
13index 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 }