diff options
| author |   James Beddek <telans@posteo.de> | 2021-06-20 10:32:36 +1200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-10-31 03:06:04 +0000 |
| commit | 0ac16a4b3ac91f93754f4a0d803761904a2b6dc4 (patch) | |
| tree | b874461552bf677af69a8ef8d6e2f8d2cc582d23 /dev-qt | |
| parent | net-misc/bfgminer: Upstream patch to fix build failure with USE=-cpumining (diff) | |
| download | gentoo-0ac16a4b3ac91f93754f4a0d803761904a2b6dc4.tar.gz gentoo-0ac16a4b3ac91f93754f4a0d803761904a2b6dc4.tar.bz2 gentoo-0ac16a4b3ac91f93754f4a0d803761904a2b6dc4.zip | |
dev-qt/qtwebengine: fix build with sys-devel/clang[default-libcxx]
Signed-off-by: James Beddek <telans@posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/21337
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch new file mode 100644 index 000000000000..fdcc787971ca --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch @@ -0,0 +1,10 @@ +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -25,6 +25,7 @@ + msvc:!clang_cl: gn_gen_args += --use-lto + + gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args ++ gn_configure += --no-static-libstdc++ + macos { + gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" + } diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild index b06e54bda94f..e920abe31ae8 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild @@ -176,6 +176,11 @@ src_prepare() { eapply "${FILESDIR}/qtwebengine-5.15.2_p20210824-harfbuzz-3.0.0.patch" fi + # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` + if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then + eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" + fi + qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |