From nobody Sun Oct 30 12:41:55 2022 X-Original-To: dev-commits-ports-all@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 4N0bWm0p0Cz4gpnf; Sun, 30 Oct 2022 12:41: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 4N0bWm0BBLz3h3F; Sun, 30 Oct 2022 12:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667133716; 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=RKXCeMJoxXn1nvarCzL9p3th9HceUESSY3M3ML2iaGU=; b=p/3qbrJUUBFPE+m4KvTSTB/a7prQcgVihPAloVQlIejpwckBLvwhQSjXvca6kCeoeNkcn5 tcJIBpBaLrhyKtUhImcl/NCIPIxW26kAKns8DRrepqaz7xMAbmSF6M72Bi6TGuJOzkWUF6 tt1aWheBnhigN5PnwwwmpqsR4o45NOOx1cKWO1GChnMPLbr479qsJghrLATNYbQePaXahW 3b8Bm65bnsBEntkG84NiyGXlMgnok0csOjGyS88UEHZwE8jgshbPJLgB4KZsMfVuleqkUn EB8j8htfV92lo9RWMuoPrGH+dtJl5aj28ThjAtNFZWWNU6XvAN9yykK2GGIT+g== 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 4N0bWl6M3xzxKD; Sun, 30 Oct 2022 12:41:55 +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 29UCftsF084254; Sun, 30 Oct 2022 12:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29UCftZ5084253; Sun, 30 Oct 2022 12:41:55 GMT (envelope-from git) Date: Sun, 30 Oct 2022 12:41:55 GMT Message-Id: <202210301241.29UCftZ5084253@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: a26cdddaa6b6 - main - www/iridium: unbreak build on arm64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: a26cdddaa6b6a31e9a15519ff94ba2cabd040428 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667133716; 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=RKXCeMJoxXn1nvarCzL9p3th9HceUESSY3M3ML2iaGU=; b=K6wGtAXpQC0KMzYWmYdX/wMUloTkvDFDlCRBP9Kr937HXU7bHZ+buZFQphrYmpkCQIA1Wc uRA9lpa6oN7oIKMILblOnPFUWEyZCWicAvkr+q99FL0/TfR7BFCsX5629XH8hjy7Zcu7rd Xtx8LC9bUOIENYJ1w1liDej01YlCobqs7CJ9ypOnQMbUPbpIHxEO6G80Neop6Po0Oe/Y+w mD1+Ykk7xO+tSMJ9syv/jRJr8bITVTsPURcXxYtgj8ThqDxyPoUi2N0LLq37iqRpN+2vNc UE2Qlb3JasfH6X6dynY04/qL/4lcK6yBC04wyaYfeyrZd31mOe4l8gPI2cgqJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667133716; a=rsa-sha256; cv=none; b=SeCVhwAtUIPS+ykIoB5ifiRI0ZKxEOEvORp0i9HATDFpuUihvaXUY5bUbdyapZlN3XTluS 6PTKpoJs5KhSXwTb/V59hnYaEgeZuzCnDLRYg2X8GMm0Lu+cNx1886VpbZWqa+zHorKUTT j0bQUMk27npiaHqyht5B0mv6g4DUoFkghUOyKFKo7LdBHoWIUuoCSeJ7CoJlRVP8OAMGSX mbzk5U9pWGH/RwjcHU1gV+duXTbJ+tabo4ofsM7pAKem1Oq/qtJx+H34uuQoyElvnnZVZn FANajPSV2f5zVrag7HJCamPE5F1tieAK40P27zExEAdAr9tQjFqMHGe4/KhcXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=a26cdddaa6b6a31e9a15519ff94ba2cabd040428 commit a26cdddaa6b6a31e9a15519ff94ba2cabd040428 Author: Robert Nagy AuthorDate: 2022-10-30 12:22:59 +0000 Commit: Rene Ladan 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