From nobody Sun Oct 30 12:42:35 2022 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 4N0bXX0D4Gz4gpgS; Sun, 30 Oct 2022 12:42:36 +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 4N0bXW6rKlz3hLW; Sun, 30 Oct 2022 12:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667133756; 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=iafT2eNfFOzh4J+/j7EfKzg68xIzUErTZ94A9b34id8=; b=nb8nXl5Sn+QUHE1e7I9zFlWt0vRnY/PJAODh+FQo8phQJxglxahsT4U3cNxsQMekkK4OOl CZUb1mw1+2b8r0jUf1Mm42+gy2y85QGCvASS9m+J94yo4E1VExnKe1rhE0AHwPY94L/UIS 1KmGGTXhSa4vGZvLXcbTFIs9Nbp6jgA8fk7wb2N/uUJBXgHBETvD8Y7lcTYj7+VoS8ivGE 7C3CZmkiC5D4ZX1tUFQDWV1CDH0l7Bh1UW+2J47fRS49eAgg/LRX4fh+wgHj9SMo++QupV upFf1bk6bXbgLPQkt5xfxtx+219V8kVB+xpl/tYrqcEUtnNHQO9Z3JsJBGSEww== 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 4N0bXW5vFbzxPk; Sun, 30 Oct 2022 12:42:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29UCgZpA085206; Sun, 30 Oct 2022 12:42:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29UCgZQa085205; Sun, 30 Oct 2022 12:42:35 GMT (envelope-from git) Date: Sun, 30 Oct 2022 12:42:35 GMT Message-Id: <202210301242.29UCgZQa085205@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: 69d0eca8ce92 - 2022Q4 - www/iridium: 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 69d0eca8ce9238ab3eb37ba532ceb0acdee41ee2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667133756; 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=iafT2eNfFOzh4J+/j7EfKzg68xIzUErTZ94A9b34id8=; b=LUohnwBpKlyLTZKM0PWANeCE7+2U22yZAjce+rnAfPyDMNoQ6/In582kdx8f5w3X9LrrzW TPuq/D7QX21kGevHm70bhg3TNLNVeiFsChipw2JVlMOKEVxeSDy3s3a7dFjJqLbCLGXRpm Uoq0uesw2aPxNBXvRiP5NKzS9No+VArJAVX+5XwVBRVh7qrsi+qc3HazC+7TdjJ+Pr9g/j +7hCCOdOU5VA2zZtSpX2kJK+a1QlIPtM5aBbbp4PJYohGUcDLGTDIRdvFTMiV3y05tG1Bv TAtHV8OTlR9hZJquehAzW2tQDsmcVW5yw8uoubRfF34qEtqb3htAuch4CA38Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667133756; a=rsa-sha256; cv=none; b=kKEMcXzAPl93/8bLpBXnJrFrDjoi+Ivyma2Pw7RU41AAObZfO+WzSRwhLdNEkoOoSr9cY1 rXFZb2OlpIxxq3PkoG8sevI2Oz2lO/+zOXZH5Lm1TZTTGwsXN7aSuAO64VdASJoDrQhcsA PG1Ciia5TlhrNMAIwAf+MteT6c9FxGH7r9/lcA8gxTvZ3gTwG8ETWpbuC4lwzEi7ET4W3O lmKCeG/tuTpnVocDzUpk6nUZrU5jwfrzrOBIEhRakph1YpLn2+kgePQ2o7UopaswvcZFO5 rDIWpXKkUePByHHjZCT8wuKoc0Rzw2jpjE/P2JCDt+yEMZWIdinMgm+QIbF4yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=69d0eca8ce9238ab3eb37ba532ceb0acdee41ee2 commit 69d0eca8ce9238ab3eb37ba532ceb0acdee41ee2 Author: Robert Nagy AuthorDate: 2022-10-30 12:22:59 +0000 Commit: Rene Ladan CommitDate: 2022-10-30 12:42:25 +0000 www/iridium: unbreak build on arm64 (cherry picked from commit a26cdddaa6b6a31e9a15519ff94ba2cabd040428) --- .../patch-base_allocator_partition__allocator_partition__root.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc index 96b13ce784d5..836a01cee4d1 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/partition_root.cc.orig 2022-10-05 07:34:01 UTC +--- base/allocator/partition_allocator/partition_root.cc.orig 2022-10-30 12:20:09 UTC +++ base/allocator/partition_allocator/partition_root.cc @@ -33,7 +33,7 @@ #include "wow64apiset.h" @@ -23,7 +23,7 @@ (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / MaxPurgeableSlotSize(); -#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) -+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64)) ++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) // It's better for slot_usage to be stack-allocated and fixed-size, which // demands that its size be constexpr. On IS_APPLE and Linux on arm64, // PartitionPageSize() is always SystemPageSize() << 2, so regardless of