<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/93dd11fe837144c6668932bdc7c6a85cb4138159">https://github.com/macports/macports-ports/commit/93dd11fe837144c6668932bdc7c6a85cb4138159</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 93dd11fe837144c6668932bdc7c6a85cb4138159
</span>Author: John M Kuhn <John.M.Kuhn@noaa.gov>
AuthorDate: Mon Jul 15 18:50:31 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gmt5: fix build on arm64
</span>---
science/gmt5/Portfile | 6 +++++-
science/gmt5/files/patch-gmt5-arm64.diff | 11 +++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmt5/Portfile b/science/gmt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 645ef33cb18..b09f400fae1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gmt5
</span> github.setup GenericMappingTools gmt 5.4.5
github.tarball_from releases
distname ${github.project}-${github.version}-src
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 19
</span> subport gmt6 {
github.setup GenericMappingTools gmt 6.5.0
revision 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,10 @@ depends_lib port:curl \
</span> port:gshhg-gmt \
port:netcdf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gmt5"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-gmt5-arm64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default_variants +gdal +pcre
if {![variant_isset lgpl]} {
default_variants-append +nonfree
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmt5/files/patch-gmt5-arm64.diff b/science/gmt5/files/patch-gmt5-arm64.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..116f2b24dea
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmt5/files/patch-gmt5-arm64.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common_sighandler.c.orig 2019-01-03 15:39:17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common_sighandler.c 2024-07-15 17:48:27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if __DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifdef __x86_64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define UC_IP(uc) ((void *) (uc)->uc_mcontext->__ss.__rip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif __arm64__ /* Apple Silicon, e.g. M1 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define UC_IP(uc) ((void *) (uc)->uc_mcontext->__ss.__pc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define UC_IP(uc) ((void *) (uc)->uc_mcontext->__ss.__eip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span></pre><pre style='margin:0'>
</pre>