<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8d187d0326e70bdbee6e8b5e9f2f01ba802d2e75">https://github.com/macports/macports-ports/commit/8d187d0326e70bdbee6e8b5e9f2f01ba802d2e75</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8d187d0326e70bdbee6e8b5e9f2f01ba802d2e75
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon Oct 19 19:17:39 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> meson: add upstream patch for typo
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> machintosh -> macintosh
</span>---
devel/meson/Portfile | 3 +++
devel/meson/files/patch-meson-powermacintosh.diff | 13 +++++++++++++
2 files changed, 16 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1710f0c7e05..ab512176ea0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,9 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> remove-Wl,-no_weak_imports.patch
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/mesonbuild/meson/pull/7871
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-powermacintosh.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # https://github.com/mesonbuild/meson/issues/6187
patchfiles-append patch-meson-32bit-apple.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/patch-meson-powermacintosh.diff b/devel/meson/files/patch-meson-powermacintosh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..96d7fa1458c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/patch-meson-powermacintosh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git mesonbuild/environment.py mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e3ea9564a..8c343d654 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/environment.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trial = 'arm'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif trial.startswith(('powerpc64', 'ppc64')):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trial = 'ppc64'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif trial.startswith(('powerpc', 'ppc')) or trial in {'macppc', 'power machintosh'}:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif trial.startswith(('powerpc', 'ppc')) or trial in {'macppc', 'power macintosh'}:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trial = 'ppc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif trial in ('amd64', 'x64', 'i86pc'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trial = 'x86_64'
</span></pre><pre style='margin:0'>
</pre>