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 516BE15803E for ; Tue, 2 Jan 2024 05:16:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 890322BC02B; Tue, 2 Jan 2024 05:16:36 +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 618192BC02B for ; Tue, 2 Jan 2024 05:16:36 +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 44CC2340775 for ; Tue, 2 Jan 2024 05:16:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0F5FAC2 for ; Tue, 2 Jan 2024 05:16:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1704172568.d2cc25faafdc413cb9b09775c40cb36a716c44a6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-120.0.6099.129.ebuild X-VCS-Directories: www-client/chromium/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d2cc25faafdc413cb9b09775c40cb36a716c44a6 X-VCS-Branch: master Date: Tue, 2 Jan 2024 05:16:33 +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: 560356f7-cfdd-43dd-bcba-da4b18fda9f9 X-Archives-Hash: 2b114fe0352fb8145040f891f7c7d1e4 commit: d2cc25faafdc413cb9b09775c40cb36a716c44a6 Author: Sam James gentoo org> AuthorDate: Tue Jan 2 05:16:08 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 2 05:16:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2cc25fa www-client/chromium: force LLD for arm64 Closes: https://bugs.gentoo.org/918897 Signed-off-by: Sam James gentoo.org> www-client/chromium/chromium-120.0.6099.129.ebuild | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/www-client/chromium/chromium-120.0.6099.129.ebuild b/www-client/chromium/chromium-120.0.6099.129.ebuild index 37c3c0cbb59c..57deed6f78f7 100644 --- a/www-client/chromium/chromium-120.0.6099.129.ebuild +++ b/www-client/chromium/chromium-120.0.6099.129.ebuild @@ -1,4 +1,4 @@ -# Copyright 2009-2023 Gentoo Authors +# Copyright 2009-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,6 +23,9 @@ GN_MIN_VER=0.2122 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120: # webrtc - no matching member function for call to 'emplace' : ${CHROMIUM_FORCE_LIBCXX=yes} +# This variable is set to yes when building with bfd is broken. +# See bug #918897 for arm64 where bfd can't handle the size. +: ${CHROMIUM_FORCE_LLD=no} VIRTUALX_REQUIRED="pgo" @@ -210,6 +213,13 @@ if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then BDEPEND+=" >=sys-devel/clang-${LLVM_MIN_SLOT}" fi +if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then + BDEPEND+=" >=sys-devel/lld-${LLVM_MIN_SLOT}" +else + # XXX: Hack for arm64 for bug #918897 + BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )" +fi + if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -247,6 +257,11 @@ python_check_deps() { python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" } +needs_lld() { + # XXX: Temporary hack w/ use arm64 for bug #918897 + [[ ${CHROMIUM_FORCE_LLD} == yes ]] || use arm64 +} + needs_clang() { [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo } @@ -705,7 +720,9 @@ chromium_configure() { fi # Force lld for lto and pgo builds, otherwise disable, bug 641556 - if use lto || use pgo; then + if needs_lld || use lto || use pgo; then + # https://bugs.gentoo.org/918897#c32 + append-ldflags -Wl,--undefined-version myconf_gn+=" use_lld=true" else myconf_gn+=" use_lld=false"