<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d00d247b3af7fcad544e2cb5a5901a3f991170a2">https://github.com/macports/macports-ports/commit/d00d247b3af7fcad544e2cb5a5901a3f991170a2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d00d247b3af helm: use arm64 distfiles only if available for that subport
</span>d00d247b3af is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d00d247b3af7fcad544e2cb5a5901a3f991170a2
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sun Mar 27 00:22:52 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> helm: use arm64 distfiles only if available for that subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only a subset of Helm versions have an arm64 binary available, so even
</span><span style='display:block; white-space:pre;color:#404040;'> if we are currently on the arm64 architecture, default to the x86_64 binary
</span><span style='display:block; white-space:pre;color:#404040;'> in all cases UNLESS this particular subport has an arm64 version available.
</span>---
sysutils/helm/Portfile | 67 +++++++++++++++++++++++++++++++-------------------
1 file changed, 42 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/helm/Portfile b/sysutils/helm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 073d6a072dc..9d1693c0ea1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/helm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/helm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,20 +16,33 @@ subport helm_select {}
</span> # *NOTE* Remember to update `latestVersion` on a version upgrade.
set latestVersion helm-3.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set armAvailable no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc helmVersion {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global baseVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global patchNumber
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${baseVersion}.${patchNumber}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc helmDistBase {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return helm-v[helmVersion]-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport helm-3.8 {
set baseVersion 3.8
set patchNumber 1
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bb47265d1b1275cc895f680be65acd06c394e88d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set armAvailable yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [helmDistBase]-arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bb47265d1b1275cc895f680be65acd06c394e88d \
</span> sha256 5f0fea586781fb867b92c10133786949ab6a447f297d5c12e1e8f5dd3a9ed712 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 14082964
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d295fd8debbc4793b510490419e271275b3dfab8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14082964 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [helmDistBase]-amd64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d295fd8debbc4793b510490419e271275b3dfab8 \
</span> sha256 3b6d87d360a51bf0f2344edd54e3580a8e8de2c4a4fd92eccef3e811f7e81bb3 \
size 14318363
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
subport helm-3.7 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,15 +50,17 @@ subport helm-3.7 {
</span> set patchNumber 2
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 903cf44fa466a1901aaa21a1b40c595041d153c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set armAvailable yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [helmDistBase]-arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 903cf44fa466a1901aaa21a1b40c595041d153c6 \
</span> sha256 260d4b8bffcebc6562ea344dfe88efe252cf9511dd6da3cccebf783773d42aec \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13978034
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 51cfcf1a0bffeba102afffe8333bebd875a11e94 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13978034 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [helmDistBase]-amd64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 51cfcf1a0bffeba102afffe8333bebd875a11e94 \
</span> sha256 5a0738afb1e194853aab00258453be8624e0a1d34fcc3c779989ac8dbcd59436 \
size 14529117
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
subport helm-3.6 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,15 +68,16 @@ subport helm-3.6 {
</span> set patchNumber 3
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 695a17118869a5aced451048907ed27cc59a3cdd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set armAvailable yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums [helmDistBase]-arm64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 695a17118869a5aced451048907ed27cc59a3cdd \
</span> sha256 a50b499dbd0bbec90761d50974bf1e67cc6d503ea20d03b4a1275884065b7e9e \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13810693
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8082929fd4afea08cc40d11fcb9cf1f33347f2ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13810693 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [helmDistBase]-amd64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8082929fd4afea08cc40d11fcb9cf1f33347f2ef \
</span> sha256 84a1ff17dd03340652d96e8be5172a921c97825fd278a2113c8233a4e8db5236 \
size 14356954
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
subport helm-3.5 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +220,7 @@ if {${subport} == ${name}} {
</span> } else {
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs x86_64
</span>
depends_run port:helm_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,13 +234,14 @@ if {${subport} == ${name}} {
</span> complex Kubernetes application.
master_sites https://get.helm.sh/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname [helmDistBase]-amd64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ${armAvailable} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs arm64 x86_64
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname helm-v${version}-darwin-arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir darwin-arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname helm-v${version}-darwin-amd64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir darwin-amd64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname [helmDistBase]-arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
use_configure no
</pre><pre style='margin:0'>
</pre>