| 1 |
commit: a6c5e4451941cb87c1fdd3121f36e2ba5f132648 |
| 2 |
Author: James Beddek <telans <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sat Jun 19 22:32:36 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 24 23:44:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a6c5e445 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: fix build with sys-devel/clang[default-libcxx] |
| 9 |
|
| 10 |
See also: https://github.com/gentoo/gentoo/pull/21337 |
| 11 |
|
| 12 |
Signed-off-by: James Beddek <telans <AT> posteo.de> |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/qtwebengine-5.15.2_p20210521-clang-libc++.patch | 10 ++++++++++ |
| 17 |
dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild | 5 +++++ |
| 18 |
2 files changed, 15 insertions(+) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 00000000..fdcc7879 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch |
| 25 |
@@ -0,0 +1,10 @@ |
| 26 |
+--- a/src/buildtools/gn.pro |
| 27 |
++++ b/src/buildtools/gn.pro |
| 28 |
+@@ -25,6 +25,7 @@ |
| 29 |
+ msvc:!clang_cl: gn_gen_args += --use-lto |
| 30 |
+ |
| 31 |
+ gn_configure = $$system_quote($$gn_bootstrap) $$gn_gen_args |
| 32 |
++ gn_configure += --no-static-libstdc++ |
| 33 |
+ macos { |
| 34 |
+ gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" |
| 35 |
+ } |
| 36 |
|
| 37 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild |
| 38 |
index c8411e17..f2b7c789 100644 |
| 39 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild |
| 40 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild |
| 41 |
@@ -170,6 +170,11 @@ src_prepare() { |
| 42 |
done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null) |
| 43 |
fi |
| 44 |
|
| 45 |
+ # src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++` |
| 46 |
+ if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then |
| 47 |
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch" |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri |
| 51 |
qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri |
Archives