From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9B4D1158086 for ; Fri, 24 Dec 2021 23:57:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B7872BC03E; Fri, 24 Dec 2021 23:57:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3EA32BC03E for ; Fri, 24 Dec 2021 23:57:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F5E734324C for ; Fri, 24 Dec 2021 23:57:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F9DE256 for ; Fri, 24 Dec 2021 23:57:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1640389487.a6c5e4451941cb87c1fdd3121f36e2ba5f132648.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-clang-libc++.patch dev-qt/qtwebengine/qtwebengine-5.15.2.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a6c5e4451941cb87c1fdd3121f36e2ba5f132648 X-VCS-Branch: master Date: Fri, 24 Dec 2021 23:57:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e3dc1eb-f3be-4a2b-926f-c32565125580 X-Archives-Hash: a1f58afc387fd55adb35c4a5bb01a724 commit: a6c5e4451941cb87c1fdd3121f36e2ba5f132648 Author: James Beddek posteo de> AuthorDate: Sat Jun 19 22:32:36 2021 +0000 Commit: Andreas Sturmlechner gentoo 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 posteo.de> Signed-off-by: Sam James gentoo.org> Signed-off-by: Andreas Sturmlechner 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