commit: a6c5e4451941cb87c1fdd3121f36e2ba5f132648 Author: James Beddek <telans <AT> posteo <DOT> de> AuthorDate: Sat Jun 19 22:32:36 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Dec 24 23:44:47 2021 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a6c5e445
dev-qt/qtwebengine: fix build with sys-devel/clang[default-libcxx] See also: https://github.com/gentoo/gentoo/pull/21337 Signed-off-by: James Beddek <telans <AT> posteo.de> Signed-off-by: Sam James <sam <AT> gentoo.org> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 ++++++++++ dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 5 +++++ 2 files changed, 15 insertions(+) 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 00000000..fdcc7879 --- /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.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild index c8411e17..f2b7c789 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild @@ -170,6 +170,11 @@ src_prepare() { done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) 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
