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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 61D93158020 for ; Thu, 15 Dec 2022 11:56:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 960AAE0794; Thu, 15 Dec 2022 11:56:58 +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 6AEDCE0794 for ; Thu, 15 Dec 2022 11:56:58 +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 3A3C4340CB1 for ; Thu, 15 Dec 2022 11:56:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68F6C54C for ; Thu, 15 Dec 2022 11:56:55 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1671105399.3f9e88471ffe3aa048e513c18b82f15702fab04f.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-108.0.5359.124.ebuild X-VCS-Directories: www-client/chromium/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: 3f9e88471ffe3aa048e513c18b82f15702fab04f X-VCS-Branch: master Date: Thu, 15 Dec 2022 11:56:55 +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: 7291f03b-52a8-47ad-84ec-fdc4dff6cf3f X-Archives-Hash: 1938e2e9efa05dc1d082d7c088f94384 commit: 3f9e88471ffe3aa048e513c18b82f15702fab04f Author: Stephan Hartmann gentoo org> AuthorDate: Thu Dec 15 11:54:22 2022 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Thu Dec 15 11:56:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f9e8847 www-client/chromium: fix cross compiling with qt5 Signed-off-by: Stephan Hartmann gentoo.org> www-client/chromium/chromium-108.0.5359.124.ebuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/www-client/chromium/chromium-108.0.5359.124.ebuild b/www-client/chromium/chromium-108.0.5359.124.ebuild index 467c429a2729..46391da7fd60 100644 --- a/www-client/chromium/chromium-108.0.5359.124.ebuild +++ b/www-client/chromium/chromium-108.0.5359.124.ebuild @@ -169,6 +169,9 @@ BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] ') >=app-arch/gzip-1.7 + !headless? ( + qt5? ( dev-qt/qtcore:5 ) + ) libcxx? ( >=sys-devel/clang-13 ) lto? ( $(depend_clang_llvm_versions 13 14 15) ) pgo? ( @@ -941,7 +944,16 @@ chromium_configure() { myconf_gn+=" use_system_libdrm=true" myconf_gn+=" use_system_minigbm=true" myconf_gn+=" use_xkbcommon=true" - use qt5 && export PATH="${PATH}:$(qt5_get_bindir)" + if use qt5; then + local moc_dir="$(qt5_get_bindir)" + if tc-is-cross-compiler; then + # Hack to workaround get_libdir not being able to handle CBUILD, bug #794181 + local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt) + cbuild_libdir=${cbuild_libdir:2} + moc_dir="${EPREFIX}"/${cbuild_libdir/% }/qt5/bin + fi + export PATH="${PATH}:${moc_dir}" + fi myconf_gn+=" use_qt=$(usex qt5 true false)" myconf_gn+=" ozone_platform_x11=$(usex X true false)" myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"