diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:25:55 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-06-04 08:31:38 +0300 |
commit | 0106f58f31df6b426dca2bb810fed5009d4cb28f (patch) | |
tree | a84de94177cb0c9ae65628d0875ebe90365a2254 /recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | |
parent | e990651e683b47e60fc981dc4edb285a795ae490 (diff) | |
parent | 17fb7499c12764264212b1a28eb5782c741964d5 (diff) | |
download | meta-qt5-0106f58f31df6b426dca2bb810fed5009d4cb28f.tar.gz |
Merge remote-tracking branch 'qtyocto/5.13' into dev
* qtyocto/5.13: (46 commits)
qtwayland: update module
qt5: update submodules
qt5: update submodules
qt3d-runtime: update to v2.3
qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
qtbase: add libxext dependency for xcb PACKAGECONFIG
python-pyqt5: Update to version 5.12.1.
python-pyqt: Fix annoying problems.
qtwebengine: arm: use OE specified -mcpu option
Revert "qtbase: Adjust target mkspec settings"
qtbase-tools: Fix error during pkg_postinst
qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
qtwayland: check also that the destination for private headers exists before installing them
qtwayland: improve manual header installation
qtwayland: workaround upstream bug: install missing headers manually
qtwayland: disable gold for all archs like in qtbase
qt5: upgrade to 5.12.3
qtbase: disable gold for all archs not just x86
...
Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75
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..07092012 --- /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 b3125c1b3f32915aa80acf58a9d1eeab4e260b17 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 | } | ||