diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:48:12 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-01-29 12:52:10 +0200 |
commit | a358108b09762390ec951f560540bb99aaf9f2a2 (patch) | |
tree | 6d9e6c078f46403bb2e76a25f4aa56c990c23083 /recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch | |
parent | c32de2f746d944f515e9e47dd330dfb64b3ca280 (diff) | |
parent | ce766374432309b85fdcfe8ef287dbb2ef11b337 (diff) | |
download | meta-qt5-a358108b09762390ec951f560540bb99aaf9f2a2.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10
* qtyocto/upstream/master:
qt: refresh remaining patches and tags in meta-qt5 repos
qtwebengine: explicitly depend on bison-native
qtmqtt: add recipe
qtbase: fix a regression
qtbase: introduce QT_EDITION
packagegroup-qt5-qtcreator-debug: remove qtdeclarative-plugins
Conflicts:
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtserialbus_git.bb
Task-number: QTBUG-65164
Change-Id: Ifdb2bba80e68de28ec818fff2b2716645eb4d9c5
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch new file mode 100644 index 00000000..ba00405d --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0005-musl-link-against-libexecinfo.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From c2878f35c98b413a456fe2df9b7ce05c86020bc0 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 2409ccb..e41e5a9 100644 | ||
14 | --- a/src/core/core_module.pro | ||
15 | +++ b/src/core/core_module.pro | ||
16 | @@ -45,7 +45,7 @@ else: QMAKE_LFLAGS += $$NINJA_LFLAGS | ||
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 | ||