git: a26cdddaa6b6 - main - www/iridium: unbreak build on arm64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 30 Oct 2022 12:41:55 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a26cdddaa6b6a31e9a15519ff94ba2cabd040428
commit a26cdddaa6b6a31e9a15519ff94ba2cabd040428
Author: Robert Nagy <robert@openbsd.org>
AuthorDate: 2022-10-30 12:22:59 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-10-30 12:41:43 +0000
www/iridium: unbreak build on arm64
---
.../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