From nobody Sat Oct 14 11:59:28 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 4S723h6pXgz4xg1J; Sat, 14 Oct 2023 11:59:28 +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 4S723h6Dwjz3MVK; Sat, 14 Oct 2023 11:59:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697284768; 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=AwK42SO0e8O8+lu45OYvy8BZziGGmZ2KfYAYDMyc/X0=; b=Ra7QwGahFAtmiUyPzPNzAdi3mxhZjQ8ozB1ax3zAP9156ps/+9c8b5zHuT98oqiJaamke6 M+JTHUSCfAUu9jCIn+9bgSXND14B17TDKLZ5gt8SQ0UjaCbO+jKdhpl+3cbARFYWT2zSXw gPw8dNzZOtycrsF7c7SSz44VRSno6Z5aTWNw5mv+4AaUVA3/SXTKZv4pPNvEx2dxNlM6YL Z3nYrO60Xq3lS2y2IqETgFYds4PdR1ZrOx7w+ZEPl6v/NJkE8cdjGvr06ozE9C3yXxpZg8 t3R8OTIarv/bdJv8nCby/vHf2SfUfrdy2Y8Fw13QnuyyNQJbg+XXeAvubhvZFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697284768; a=rsa-sha256; cv=none; b=HdoohKUwp8S7C5zt+95OfsMFnyZif9CjqRGIrpNEdtK+hXnFmW/zVVNi/R6mMbE+flEvx7 sj9tcu5U/OsO+vGfe9mHVTueIKm5Frvtx0u3xxTQqZu2vc3JanvPOFsStZF2/2zCy+E+V+ wzHaKmL3ZB6xEW9LSPP3UGT2au39ztLxoBKOLWMOY3CjAi7kGtDb60Rc4Q0l5t9fDDrVZ4 Pddbnzem2u8GTgSn23Jtar1dR20hXFFHagTSEJdODTCLjgasD1cCN0upmoRGaAaucuts7d 5O0jiAXbhgLJSxz7BTxrTTm7gYQHSkz9uK/fJTsh6BkhsFy7BBzvQDNsMWXc0Q== 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=1697284768; 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=AwK42SO0e8O8+lu45OYvy8BZziGGmZ2KfYAYDMyc/X0=; b=WSMiaQ5Tcu0L5KEK6Zm8TsrZoKwONZcI92bcBIneGCSwblbHD/D9JFYE1VralW45Ur1BSS S0ALG6mjEzB1iedlMo8qRSAR9Ja3IMobShKrMWH1mCfLBL9PuDX66NSFUetXlXZRe06WrV O6E79iQFjj+KvkCs65/wJTWDzjjd40wamW+onGSE16euS2awKBkEfZRj145U5Z2bKwvaEh D+JGurbHXDuCfGb61NFaeR1AEwsPpnL2PIsW4VGDt95iW/TspJ/RQa2VdAqo3Z1VkxSG56 wLE9KOPzhRWD5eZQRRBnGgSpPlvA9U1x8oYMdeFTZUAZ7pz+pmPxxFOK9VoqDA== 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 4S723h51jjzTlF; Sat, 14 Oct 2023 11:59:28 +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 39EBxSdo031567; Sat, 14 Oct 2023 11:59:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39EBxS1G031563; Sat, 14 Oct 2023 11:59:28 GMT (envelope-from git) Date: Sat, 14 Oct 2023 11:59:28 GMT Message-Id: <202310141159.39EBxS1G031563@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: 0b56b2063250 - main - www/*chromium: unbreak build on i386 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: 0b56b2063250ea956fe0c26427c44e3bdc409186 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b56b2063250ea956fe0c26427c44e3bdc409186 commit 0b56b2063250ea956fe0c26427c44e3bdc409186 Author: Robert Nagy AuthorDate: 2023-10-14 11:58:58 +0000 Commit: Robert Nagy CommitDate: 2023-10-14 11:59:23 +0000 www/*chromium: unbreak build on i386 --- ...fetto_src_trace__processor_db_storage_numeric__storage.cc | 4 ++-- www/chromium/files/patch-v8_BUILD.gn | 12 ++++++------ ...fetto_src_trace__processor_db_storage_numeric__storage.cc | 4 ++-- www/ungoogled-chromium/files/patch-v8_BUILD.gn | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc index 8bb44fed5fdb..7e6744d9db1c 100644 --- a/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc +++ b/www/chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc @@ -1,10 +1,10 @@ ---- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2023-09-13 12:11:42 UTC +--- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2023-10-14 11:56:57 UTC +++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc @@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op, } else if (const auto* i32 = std::get_if(&*val)) { auto* start = static_cast(data_) + range.start; TypedLinearSearch(*i32, start, op, builder); -+#if defined(__OpenBSD__) && defined(__i386__) ++#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) + } else if (const auto* db = std::get_if(&*val)) { + auto* start = static_cast(data_) + range.start; +#else diff --git a/www/chromium/files/patch-v8_BUILD.gn b/www/chromium/files/patch-v8_BUILD.gn index dfcbe5f2fddd..c1b88cd54d2b 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-11 18:22:24 UTC +--- v8/BUILD.gn.orig 2023-10-14 11:56:57 UTC +++ v8/BUILD.gn @@ -1417,6 +1417,14 @@ config("toolchain") { } else if (target_os == "chromeos") { @@ -15,8 +15,8 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2358,6 +2366,12 @@ template("run_mksnapshot") { - ] +@@ -2380,6 +2388,12 @@ template("run_mksnapshot") { + } } + if (v8_current_cpu == "x86") { @@ -25,9 +25,9 @@ + ] + } + - if (v8_enable_builtins_profiling) { - args += [ "--turbo-profiling" ] - } + # 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-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc index cf81db2a77d1..7e6744d9db1c 100644 --- a/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc +++ b/www/ungoogled-chromium/files/patch-third__party_perfetto_src_trace__processor_db_storage_numeric__storage.cc @@ -1,10 +1,10 @@ ---- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2023-09-17 07:59:53 UTC +--- third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc.orig 2023-10-14 11:56:57 UTC +++ third_party/perfetto/src/trace_processor/db/storage/numeric_storage.cc @@ -245,8 +245,13 @@ BitVector NumericStorage::LinearSearch(FilterOp op, } else if (const auto* i32 = std::get_if(&*val)) { auto* start = static_cast(data_) + range.start; TypedLinearSearch(*i32, start, op, builder); -+#if defined(__OpenBSD__) && defined(__i386__) ++#if (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__i386__) + } else if (const auto* db = std::get_if(&*val)) { + auto* start = static_cast(data_) + range.start; +#else diff --git a/www/ungoogled-chromium/files/patch-v8_BUILD.gn b/www/ungoogled-chromium/files/patch-v8_BUILD.gn index 45003731447c..c1b88cd54d2b 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-13 13:20:35 UTC +--- v8/BUILD.gn.orig 2023-10-14 11:56:57 UTC +++ v8/BUILD.gn @@ -1417,6 +1417,14 @@ config("toolchain") { } else if (target_os == "chromeos") { @@ -15,8 +15,8 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -2358,6 +2366,12 @@ template("run_mksnapshot") { - ] +@@ -2380,6 +2388,12 @@ template("run_mksnapshot") { + } } + if (v8_current_cpu == "x86") { @@ -25,9 +25,9 @@ + ] + } + - if (v8_enable_builtins_profiling) { - args += [ "--turbo-profiling" ] - } + # 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") { } }