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 9E167158090 for ; Sun, 29 May 2022 18:13:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB030E08A0; Sun, 29 May 2022 18:13:01 +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 A0DC9E08A0 for ; Sun, 29 May 2022 18:13:01 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA69434186E for ; Sun, 29 May 2022 18:13:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB455D3 for ; Sun, 29 May 2022 18:12:58 +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: <1653847953.ec73063e84d24d8c5941dacbdfec4af6d0d87387.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-104.0.5083.0.ebuild X-VCS-Directories: www-client/chromium/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: ec73063e84d24d8c5941dacbdfec4af6d0d87387 X-VCS-Branch: master Date: Sun, 29 May 2022 18:12:58 +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: 538b4098-02e6-40ea-91ea-307a663da631 X-Archives-Hash: 36de8b7a298a9805f22a2d61de1a8759 commit: ec73063e84d24d8c5941dacbdfec4af6d0d87387 Author: Stephan Hartmann gentoo org> AuthorDate: Sun May 29 18:12:33 2022 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Sun May 29 18:12:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec73063e www-client/chromium: add missing || die, re-add arm64 fix Signed-off-by: Stephan Hartmann gentoo.org> www-client/chromium/chromium-104.0.5083.0.ebuild | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/www-client/chromium/chromium-104.0.5083.0.ebuild b/www-client/chromium/chromium-104.0.5083.0.ebuild index f4c991f52087..a85c25029430 100644 --- a/www-client/chromium/chromium-104.0.5083.0.ebuild +++ b/www-client/chromium/chromium-104.0.5083.0.ebuild @@ -918,6 +918,11 @@ chromium_configure() { myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")" fi + # Results in undefined references in chrome linking, may require CFI to work + if use arm64; then + myconf_gn+=" arm_control_flow_integrity=\"none\"" + fi + # Enable official builds myconf_gn+=" is_official_build=$(usex official true false)" myconf_gn+=" use_thin_lto=$(usex lto true false)" @@ -1016,21 +1021,21 @@ src_compile() { chromium_compile virtx chromium_profile "$profdata" - touch "${WORKDIR}/.pgo-profiled" + touch "${WORKDIR}/.pgo-profiled" || die fi if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then # Remove phase 1 output - rm -rf out/Release + rm -r out/Release || die chromium_configure 2 "$profdata" - touch "${WORKDIR}/.pgo-phase-2-configured" + touch "${WORKDIR}/.pgo-phase-2-configured" || die fi if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then chromium_compile - touch "${WORKDIR}/.pgo-phase-2-compiled" + touch "${WORKDIR}/.pgo-phase-2-compiled" || die fi else chromium_compile