From nobody Thu Oct 19 07:28:53 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S9zq952pMz4y5sN; Thu, 19 Oct 2023 07:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S9zq94Mr0z3Jrp; Thu, 19 Oct 2023 07:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697700533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00srQmv+U20bm94bIgNMiqwZycAYkcMbSRJ7gERToPQ=; b=wBoe2KTJS9YRA/lp5/ECrgr39TPZLNzy620t+Z59a8CQR3shac0nndhKT8XuvscTjSYAFP y6m67OS2LEcbK9QpDCSZHM9xHcVejxR7iWt6PJAbxhm2n1igCT3rOLPbQdW0JHUTi/4udl Pq3jgDfzaepiRzTA8UqaxnMD9had0V12vXD+ta8H92qjpitZ2U5PLXGYlVip6+5FhOzr8F JJzn1/ZWREXNAvl5ApZEd5M4y33jiybhxutBzA/2kEpzXjLNzjp8CBCwX40UdFDQ7OJLKx WzVjn1yHH2Xb5EuDE6Sqc6mStRj0TRBj+anHpeALRWwEcC2ICMfQEbohfd5OBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697700533; a=rsa-sha256; cv=none; b=kZnXXv0GzufXYA2hGaN2rVhVoCN9QjcR7+ZzuL2eaez1ZbmKPQNKO467JOm+gCcEdr8jQ/ KmjKDHzI2g8/4coOc37Bqn5lFhER6z1C0+OH+k3W30NdSvr9yr43B8BCK/sRaE5uMGZ0qD /WuyupiDEayI1/KJkyJypAtwtIQdUNnnL6nwLZv6T9+A9eDzFDVVx9nDxSrjlpxySXAXab lOExSBL9DVZnBKqYbKar5Y9/TCNbeoToGZfQXjYIt3daPE/47AmA2lNyhqh8AIlLujbg4w p0UdhnW9xLMqW/+iwEGdGFtnnqr/AikqbVc8qvh2L/CrewDn5fBayhnHCficsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697700533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=00srQmv+U20bm94bIgNMiqwZycAYkcMbSRJ7gERToPQ=; b=SWpHapO7008Yw/ag75fGBj1pBAy5JbbdyHiJpbi3krNSn6R0rmi34ldolzln3XSn0TDsHm qOodXYdfKyA+H2H77YBqO1Fpgx+ABQBF6ZiHDfP2odQatRg7ZTktyTVAzNiFFD1FwyeB7w ZJnUzOSb9iOWou8LQduLJRMWSnMdFwgvWhbMBpjRQ3/ImYjdIu2PY282dYAiaKG5yTDhIS 7ob39pNx347f/SS95slWIg8+Sw7QdCGNQDscV5viq7cFTVAbF/NQfzvuOJrKz0hsjmN4JZ tqgNy/va8CVx9EWv/j+w8XNWAGVtrXnEKcbpeW47tB67JD2UPxt7hIvsm1mhxQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S9zq93Rrvzgg3; Thu, 19 Oct 2023 07:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39J7Srag080648; Thu, 19 Oct 2023 07:28:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39J7Sr4A080645; Thu, 19 Oct 2023 07:28:53 GMT (envelope-from git) Date: Thu, 19 Oct 2023 07:28:53 GMT Message-Id: <202310190728.39J7Sr4A080645@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Nagy Subject: git: 631589e7e2c3 - main - www/*chromium: unbreak configure on i386 if PGO is not used List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 631589e7e2c357e1ca88a8ef7b0112b1b7d376cc Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=631589e7e2c357e1ca88a8ef7b0112b1b7d376cc commit 631589e7e2c357e1ca88a8ef7b0112b1b7d376cc Author: Robert Nagy AuthorDate: 2023-10-19 07:28:14 +0000 Commit: Robert Nagy CommitDate: 2023-10-19 07:28:14 +0000 www/*chromium: unbreak configure on i386 if PGO is not used --- www/chromium/files/patch-v8_BUILD.gn | 20 ++++++++++---------- www/ungoogled-chromium/files/patch-v8_BUILD.gn | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index c1b88cd54d2b..fc6fac220522 100644 --- a/www/chromium/files/patch-v8_BUILD.gn +++ b/www/chromium/files/patch-v8_BUILD.gn @@ -1,4 +1,4 @@ ---- v8/BUILD.gn.orig 2023-10-14 11:56:57 UTC +--- v8/BUILD.gn.orig 2023-10-19 07:26:17 UTC +++ v8/BUILD.gn @@ -1417,6 +1417,14 @@ config("toolchain") { } else if (target_os == "chromeos") { @@ -15,19 +15,19 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2380,6 +2388,12 @@ template("run_mksnapshot") { +@@ -2378,6 +2386,12 @@ template("run_mksnapshot") { + if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { + args += [ "--reorder-builtins" ] } ++ ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } } -+ if (v8_current_cpu == "x86") { -+ args -= [ -+ "--abort-on-bad-builtin-profile-data", -+ ] -+ } -+ # This is needed to distinguish between generating code for the simulator - # and cross-compiling. The latter may need to run code on the host with the - # simulator but cannot use simulator-specific instructions. @@ -6111,7 +6125,7 @@ v8_component("v8_libbase") { } } diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index c1b88cd54d2b..ab423bdc412a 100644 --- a/www/ungoogled-chromium/files/patch-v8_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-v8_BUILD.gn @@ -1,4 +1,4 @@ ---- v8/BUILD.gn.orig 2023-10-14 11:56:57 UTC +--- v8/BUILD.gn.orig 2023-10-19 07:19:47 UTC +++ v8/BUILD.gn @@ -1417,6 +1417,14 @@ config("toolchain") { } else if (target_os == "chromeos") { @@ -15,19 +15,19 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2380,6 +2388,12 @@ template("run_mksnapshot") { +@@ -2378,6 +2386,12 @@ template("run_mksnapshot") { + if (!v8_enable_builtins_profiling && v8_enable_builtins_reordering) { + args += [ "--reorder-builtins" ] } ++ ++ if (v8_current_cpu == "x86") { ++ args -= [ ++ "--abort-on-bad-builtin-profile-data", ++ ] ++ } } -+ if (v8_current_cpu == "x86") { -+ args -= [ -+ "--abort-on-bad-builtin-profile-data", -+ ] -+ } -+ # This is needed to distinguish between generating code for the simulator - # and cross-compiling. The latter may need to run code on the host with the - # simulator but cannot use simulator-specific instructions. @@ -6111,7 +6125,7 @@ v8_component("v8_libbase") { } }