diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-08-17 10:16:28 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2022-08-17 07:29:34 +0000 |
| commit | 988ef07bd460b5c326cad4ea3eb509bdb093845e (patch) | |
| tree | 608d9e2f9ad1fea29315e879f11fb76ce7a09753 /recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch | |
| parent | f5a18bcebb6777fbb1379019683ff427235b06fa (diff) | |
| parent | edf4825428920c7425f907933991eaf33c6273a7 (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
Notes:
The "Fix archiver assignment" change was already present in lts-5.15
branch but got now updated for qtpdf clang patch also.
Changelog:
edf48254 qmake5_base.bbclass: Remove remove-libtool from recipe scope
9287d635 qtwebengine: Fix archiver assignment
e8ada8b8 qtpdf: Do not add -rtlib=libgcc -unwindlib=libgcc when using gcc
Conflicts:
recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch
Change-Id: I03345f702eea5ebfdee42b290cef20c285474696
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 | 2 |
1 files changed, 1 insertions, 1 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 index a5e66d23..0d4924ea 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From d0170d2466659ce467075313cb08dc72268b0d0b Mon Sep 17 00:00:00 2001 +From 9046f8a87da16f3605f600cc6beb039f40bdaa14 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo |