From nobody Wed Aug 23 10:53:34 2023 X-Original-To: dev-commits-ports-branches@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 4RW33f5XgBz4rRbH; Wed, 23 Aug 2023 10:53:34 +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 4RW33f2srNz3Mw7; Wed, 23 Aug 2023 10:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692788014; 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=mePWxkvp3pSorobtCI/qLZEkrYlr7FaPNlND++8nPaE=; b=UQdSQFxNu9XI75/JuFCTtaVeJyKMMGTMy0fInQRbodSUInlRw1Vlwcbfki6Ht4NOIhuXLi qZlag94g+FBsEe2QYvU6WxmGdvqesPVccKx0OgX8yMddx85n/z2PWPa8KZB+5fFq3T4P9Q hZ+HdfpbTf1vJbKJ/UwJHSBIPgr12XCzVzFiGkXh7kewUyW8sg6S1uDeaA2P18e+Ay3Mcq f4v10oTgFC3iMTHTrjOwUE60Bujqco6KeJ5+EoTBMMRpdQEG4Tz5947E4oWl+j1gcj0mQ2 0YeFhi8fBCCujpANaNTcsxvH92M6rnaqKgIrQm+ZsqXhZ/sTz7NtGuSK3LKgcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692788014; 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=mePWxkvp3pSorobtCI/qLZEkrYlr7FaPNlND++8nPaE=; b=mcz1IDONx8nGlPSpFXIZzVhaoC8SV1EPFDYDKlw/FNJaR+zguvFVd1m5718MHH/DlpyRPw z/K8mSETQUjkfs0HvQuer2eDp0knki8NOgovLUBHAqfiriTlYZqurRyopvI8MRjoyA1N2N Jk016UGCTzODt5JYmj/m+DJa/OzxM1JFNh0JPdIT3P8pvgRaetUkTw6rmu/YOTQDQuau5V v28rxFdlEQiQqQmQP3TA6II8aVqATeHUFEp+kio0iZVX5QANZ8ZQfC5WfNqmfXjD2E/lWp PvU6yLcTEmnaNN/quBZB26GFbifEaS3FjWmVNkJoGGETb+T7Ii/rYA5XvDs+9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692788014; a=rsa-sha256; cv=none; b=T2meSfMnxZUiQnIuvC7qznELgbOFN7zOBH9R92OWHlOTQKzEd0H3RjrU8czkp8IUxbW6jr FL943aTxpLwjFCT4IwVqM8ZV8mj71DYhKEqjsEDmkgiuUMvG5Oj/IDaErEu0AupTZUjU6N 29d8z6vFRGwRi3cBL535lQwtKY6E97YvKUxQ2VEl83pY/FSBLLQcRPYQGbv7uYuVpC588q MGvhfSzhm6x8Bw1YSBzUa219pZqD+YKncSDFznb3krE4bIa1yz697+IwLMJEnAkZS5QDwI JId07CMbM86Hgr0Zn/150h39J6pxgAO2lL5/k1tw8v0fk53sHGtxjuzbh7U9Ww== 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 4RW33f1J24zjFr; Wed, 23 Aug 2023 10:53:34 +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 37NArYjF060283; Wed, 23 Aug 2023 10:53:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37NArYpE060280; Wed, 23 Aug 2023 10:53:34 GMT (envelope-from git) Date: Wed, 23 Aug 2023 10:53:34 GMT Message-Id: <202308231053.37NArYpE060280@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 7aeb2b5eca97 - 2023Q3 - www/*chromium: unbreak build on arm64 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 7aeb2b5eca9783c5d6e3197d841a4bd1e95b027c Auto-Submitted: auto-generated The branch 2023Q3 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7aeb2b5eca9783c5d6e3197d841a4bd1e95b027c commit 7aeb2b5eca9783c5d6e3197d841a4bd1e95b027c Author: Robert Nagy AuthorDate: 2023-08-23 10:49:53 +0000 Commit: Robert Nagy CommitDate: 2023-08-23 10:53:20 +0000 www/*chromium: unbreak build on arm64 sysfs is not available on *BSD so trying to compile code to read it is futile (cherry picked from commit 06ee2c71b48b1a590d05b615d05626332d50a9f3) --- ...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);