From nobody Wed Aug 23 10:50:55 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 4RW30c14xYz4rRGq; Wed, 23 Aug 2023 10:50:56 +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 4RW30c0dKsz3M79; Wed, 23 Aug 2023 10:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692787856; 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=fJcknElA9rrQZX8Sy+VndcLJ1OyL6c7UrCpbFGZ4JAY=; b=ovzdOAo3yyAAOkNckoqEsBJh9u0snGBfOpjvttBKyG8DbqESIYg2oggcQUrNi5H6CDXx0X Tk7pApeJLq4VHcMVpGnTmQTvTxXLhygI/aw2QlS85nTs1mk4kRZMmrzCyBhf6Y8iXpIc+h +chV/fgE47CZ4mRUb1zt+I7wHgJe2fbx+w5iP2Ibmb/jogh8vemx/Y55GO0/VbAJsXuiUK WtkdP5odCke7BRd1WviTVVlpEXTA51Kiy27pDsL+xNbo8wvPHgU3JucLWpVPAwZ9OQljdY EkzST1fWYq9RLEbPaKyDWbDwJ9oD+4KvPfzY0/+SSXiVhPaUdACCYrtYKnuKjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692787856; 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=fJcknElA9rrQZX8Sy+VndcLJ1OyL6c7UrCpbFGZ4JAY=; b=n5UCXjY2YuNxHoZAgz2+j66zwaSpDooSmZLO7G7Nl7xklDm+aiD6JTpVi119Wxb27lg/Wo rx/O8CJIy6Lqbl8OYB66KofzxS8Fa0ACV5OAXGlMwkTI5fndoSd5Y/ws51rkEp6rNtP6dy /XBM+EJX/YqRUdBSWP0cFhLI0L0JtNdWjfCIcQr/7L9HotMJ0jLvLetIw98pHXb7KE85eO 9y+Vgf/N4XmQrShArBB4ADqyUySRFc0aIUwZmW5e0fIxrmy59cYEhRPJmgb1TQDxmm3tnb kn9KrGnSiPhEoZOrgpeC7Ik6zm9wb/t6Km+OZ4C8dqkoNDhM0kNp1nqupPBMWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692787856; a=rsa-sha256; cv=none; b=n3flTsl8V9RNUxWWeEgfim53CuVof0rzKKtgaAFdgVBe/7c0dI+Y91/5XSZQRH1aZMQbNm wIIwMwhL5+NRHM/OEi+HMcOacCUZe8kQZ8pCI3uRPX2D61gJwMeE/u4hkJkoS86XPO7avp hEdXRVgOQHgLsg/GQWBzEvA4U5YfQ6x7tkJb4JAGlxF/fdiG+sE7B6jnBMmGugfNCcsWWZ K6sO6+EhQ8BgDdfYyw+Th4hAfI5Ai43MLflrEDTJOyO8LInlpbBVMiraFLVNfbESskknYJ ow7vBbcnicy7rsThtDhflZzz6SHoernAypmvFG4XgyXvfop+NPg42rqFCxFCFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RW30b6rXjzj1K; Wed, 23 Aug 2023 10:50:55 +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 37NAotGW054017; Wed, 23 Aug 2023 10:50:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NAotK1054014; Wed, 23 Aug 2023 10:50:55 GMT (envelope-from git) Date: Wed, 23 Aug 2023 10:50:55 GMT Message-Id: <202308231050.37NAotK1054014@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: 06ee2c71b48b - main - www/*chromium: unbreak build on arm64 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: 06ee2c71b48b1a590d05b615d05626332d50a9f3 Auto-Submitted: auto-generated The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=06ee2c71b48b1a590d05b615d05626332d50a9f3 commit 06ee2c71b48b1a590d05b615d05626332d50a9f3 Author: Robert Nagy AuthorDate: 2023-08-23 10:49:53 +0000 Commit: Robert Nagy CommitDate: 2023-08-23 10:50:49 +0000 www/*chromium: unbreak build on arm64 sysfs is not available on *BSD so trying to compile code to read it is futile --- ...hird__party_abseil-cpp_absl_base_internal_sysinfo.cc | 17 +++++++++++++++-- ...hird__party_abseil-cpp_absl_base_internal_sysinfo.cc | 17 +++++++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 45b62182cf6f..77b14bd16655 100644 --- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-17 12:40:56 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-23 10:45:26 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,10 +30,14 @@ #include @@ -44,7 +44,20 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -433,6 +441,18 @@ pid_t GetTID() { +@@ -332,10 +340,12 @@ static double GetNominalCPUFrequency() { + // If CPU scaling is in effect, we want to use the *maximum* + // frequency, not whatever CPU speed some random processor happens + // to be using now. ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) // pledge violation + if (ReadLongFromFile("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", + &freq)) { + return freq * 1e3; // Value is kHz. + } ++#endif + + return 1.0; + #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY +@@ -433,6 +443,18 @@ pid_t GetTID() { static_assert(sizeof(pid_t) == sizeof(thread), "In NaCL int expected to be the same size as a pointer"); return reinterpret_cast(thread); diff --git a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index be3f7a7c54f7..77b14bd16655 100644 --- a/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/ungoogled-chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-18 10:26:52 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2023-08-23 10:45:26 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,10 +30,14 @@ #include @@ -44,7 +44,20 @@ #if defined(ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY) // On these platforms, the TSC frequency is the nominal CPU -@@ -433,6 +441,18 @@ pid_t GetTID() { +@@ -332,10 +340,12 @@ static double GetNominalCPUFrequency() { + // If CPU scaling is in effect, we want to use the *maximum* + // frequency, not whatever CPU speed some random processor happens + // to be using now. ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) // pledge violation + if (ReadLongFromFile("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", + &freq)) { + return freq * 1e3; // Value is kHz. + } ++#endif + + return 1.0; + #endif // !ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY +@@ -433,6 +443,18 @@ pid_t GetTID() { static_assert(sizeof(pid_t) == sizeof(thread), "In NaCL int expected to be the same size as a pointer"); return reinterpret_cast(thread);