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 0998315800A for ; Sat, 17 Jun 2023 04:49:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08145E09CC; Sat, 17 Jun 2023 04:49:46 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0BE7E09CC for ; Sat, 17 Jun 2023 04:49:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C4A233FEFB for ; Sat, 17 Jun 2023 04:49:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A6D3A96 for ; Sat, 17 Jun 2023 04:49:43 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1686977301.259d30f953e2b11e5c5804080cc86d155dce71f4.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt6-WebEngine/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild X-VCS-Directories: dev-python/PyQt6-WebEngine/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 259d30f953e2b11e5c5804080cc86d155dce71f4 X-VCS-Branch: master Date: Sat, 17 Jun 2023 04:49:43 +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: 850fc874-eec0-402b-9d51-40933ec49a15 X-Archives-Hash: 2060f15dd428ba946994ae5e2368b4d9 commit: 259d30f953e2b11e5c5804080cc86d155dce71f4 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Jun 17 04:24:20 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jun 17 04:48:21 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259d30f9 dev-python/PyQt6-WebEngine: remove gcc dependency, update hack Turns out that this *can* use clang++ but only if qtbase was built with clang++ as well, otherwise it still uses g++ even with CXX=clang++ But given the former, there is little reason to enforce the dependency. Ideally would use CXX but that would require more elaborate testing to know what it is and what qtbase was built with (perhaps if ever add the hack to qmake-utils.eclass). No revbump given PyQt* bindings are a slowish build and depcleaning gcc is a bit niche, the few interested can handle this manually until next bump. Closes: https://github.com/gentoo/gentoo/pull/31493 Signed-off-by: Ionen Wolkens gentoo.org> dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild index c14617c05118..9e4ab2b11079 100644 --- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild +++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild @@ -30,16 +30,18 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" >=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}] - >=dev-qt/qtbase-${QT_PV} - sys-devel/gcc" + >=dev-qt/qtbase-${QT_PV}" src_prepare() { default - # hack: qmake queries g++ directly for info (not building) and that doesn't - # work with clang, this is to make it at least respect CHOST (bug #726112) + # hack: qmake queries g++ or clang++ for info depending on which qtbase was + # built with, but ignores CHOST failing with -native-symlinks (bug #726112) + # and potentially using wrong information when cross-compiling mkdir "${T}"/cxx || die - ln -s "$(type -P ${CHOST}-g++ || type -P g++ || die)" "${T}"/cxx/g++ || die + local cxx + ! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ || die + ! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}" "${T}"/cxx/clang++ || die PATH=${T}/cxx:${PATH} }