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/0003-musl-link-against-libexecinfo.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/0003-musl-link-against-libexecinfo.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch new file mode 100644 index 00000000..6dc7f0cb --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From 983ba7f8f80165ade5347544f1e975bd6b67549e Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Thu, 14 Dec 2017 11:28:10 +0200 | ||
4 | Subject: [PATCH] musl: link against libexecinfo | ||
5 | |||
6 | Change-Id: Ifada60f9c72691973612850121f6fb152d70839a | ||
7 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
8 | --- | ||
9 | src/core/core_module.pro | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/core/core_module.pro b/src/core/core_module.pro | ||
13 | index 3b5d37f2..0882d5fd 100644 | ||
14 | --- a/src/core/core_module.pro | ||
15 | +++ b/src/core/core_module.pro | ||
16 | @@ -51,7 +51,7 @@ linux { | ||
17 | POST_TARGETDEPS += $$NINJA_TARGETDEPS | ||
18 | |||
19 | |||
20 | -LIBS_PRIVATE += -L$$api_library_path | ||
21 | +LIBS_PRIVATE += -L$$api_library_path -lexecinfo | ||
22 | CONFIG *= no_smart_library_merge | ||
23 | osx { | ||
24 | LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a | ||