<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4e33117dfbc71b2b229693c146ac66111d2f4aeb">https://github.com/macports/macports-ports/commit/4e33117dfbc71b2b229693c146ac66111d2f4aeb</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 4e33117dfbc gerbil: patch to fix ARM build
</span>4e33117dfbc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4e33117dfbc71b2b229693c146ac66111d2f4aeb
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue May 11 18:03:37 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> gerbil: patch to fix ARM build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62870
</span>---
science/gerbil/Portfile | 10 ++++++++++
science/gerbil/files/patch-cmake-sse2-to-archnative.diff | 10 ++++++++++
2 files changed, 20 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerbil/Portfile b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 991c5d1f0f8..3e8fee991e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,16 @@ long_description \
</span>
homepage http://gerbilvis.org/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# For ARM build, replace Intel-specific compiler arg '-sse2' with '-march=native'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Safe at this point, as we're building on a Mac with a first-generation M1 ARM CPU.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# REVIEW: We may need to revisit this if/when our ARM buildbot is upgraded to a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Mac with a later-generation ARM CPU.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.arch} eq "arm"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Building on ARM, patching sse2 to arch=native"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-sse2-to-archnative.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:opencv4 \
port:boost \
port:gdal \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerbil/files/patch-cmake-sse2-to-archnative.diff b/science/gerbil/files/patch-cmake-sse2-to-archnative.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..42e4147712c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerbil/files/patch-cmake-sse2-to-archnative.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/EnableSSE2.cmake.orig 2021-05-11 17:40:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/EnableSSE2.cmake 2021-05-11 17:40:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,6 +14,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions("/arch:SSE2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(MSVC) # assume gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions("-msse2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions("-march=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endmacro()
</span></pre><pre style='margin:0'>
</pre>