diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 12:24:15 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 12:25:44 +0300 |
commit | e26163d066a867ca8f630f7caffff207ef26b4a7 (patch) | |
tree | c55678478e7bb344459d9bdf2528f4e321e9c4d0 /recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |
parent | 0778f92089010ac7e2c3ee1f36c8c9d5c102bbf9 (diff) | |
parent | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (diff) | |
download | meta-qt5-e26163d066a867ca8f630f7caffff207ef26b4a7.tar.gz |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
89ac66b Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
f087aeb Revert "qtbase: Adjust target mkspec settings"
8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
7dc422d qtwayland: check also that the destination for private headers exists before installing them
84d647a qtwayland: improve manual header installation
3d60f9a qtwayland: workaround upstream bug: install missing headers manually
eb5d6da qtwayland: disable gold for all archs like in qtbase
e2707a0 qt5: upgrade to 5.12.3
0778424 qtbase: disable gold for all archs not just x86
4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
a4bf240 qtbase-native: add native libdir to search path
adf7f60 qt5: patch build paths from installed files
28d4bfd Upgrade to 5.12.2
5a32838 layer.conf: Add warrior to compatible release series
Conflicts:
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
Change-Id: Iec1b6e65f8dfbb73ab96d68a91ff6a5e7d93c7de
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..6b78f4ef --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From a24cb0ef3b7311719ec248f4f1771f192c7cf4a0 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 | ||