<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/151f7c48a55d61bb821376dc8a461e9efdba9c93">https://github.com/macports/macports-ports/commit/151f7c48a55d61bb821376dc8a461e9efdba9c93</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 151f7c48a55d61bb821376dc8a461e9efdba9c93
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Mon Jul 20 00:05:40 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal: Help workaround broken config.guess on Apple Silicon hosts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cb6308a63e..0897b71d7db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -281,8 +281,15 @@ variant universal {
</span> (${os.major} < 9 || [sysctl hw.cpu64bit_capable] == 0)} {
set bits_differ 1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set config_guess_bug 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set config_guess_bug 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # check if building for a completely different arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$bits_differ || (${os.arch}=="arm64" && (${arch}=="i386" || ${arch}=="x86_64" || ${arch}=="ppc" || ${arch}=="ppc64"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$bits_differ || $config_guess_bug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (${os.arch}=="arm64" && (${arch}=="i386" || ${arch}=="x86_64" || ${arch}=="ppc" || ${arch}=="ppc64"))
</span> || (${os.arch}=="i386" && (${arch}=="arm64" || ${arch}=="ppc" || ${arch}=="ppc64"))
|| (${os.arch}=="powerpc" && (${arch}=="i386" || ${arch}=="x86_64"))} {
switch -- ${arch} {
</pre><pre style='margin:0'>
</pre>