<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/139e4f3125fb3230036ef40a2ba12b3f786acb46">https://github.com/macports/macports-ports/commit/139e4f3125fb3230036ef40a2ba12b3f786acb46</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 139e4f3125f gerbil: fix ARM build, take 2
</span>139e4f3125f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 139e4f3125fb3230036ef40a2ba12b3f786acb46
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue May 11 18:26:41 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    gerbil: fix ARM build, take 2
</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                                          | 9 +++------
 ...ake-sse2-to-archnative.diff => patch-cmake-sse2-to-noop.diff} | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

<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 3e8fee991e0..bafcefa0164 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,14 +25,11 @@ long_description    \
</span> 
 homepage            http://gerbilvis.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# For ARM build, replace Intel-specific compiler arg '-sse2' with '-march=native'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-# 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:#ffe0e0;'>-# Mac with a later-generation ARM CPU.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# For ARM build, remove Intel-specific compiler arg '-sse2'.
</span> if {${os.arch} eq "arm"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_debug "Building on ARM, patching sse2 to arch=native"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ui_debug "Building on ARM, replacing -msse2 with noop"
</span>     patchfiles-append   \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-cmake-sse2-to-archnative.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-cmake-sse2-to-noop.diff
</span> }
 
 depends_lib         port:opencv4 \
<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-noop.diff
</span>similarity index 88%
rename from science/gerbil/files/patch-cmake-sse2-to-archnative.diff
rename to science/gerbil/files/patch-cmake-sse2-to-noop.diff
<span style='display:block; white-space:pre;color:#808080;'>index 42e4147712c..96b36d108dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerbil/files/patch-cmake-sse2-to-archnative.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerbil/files/patch-cmake-sse2-to-noop.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,6 @@
</span>           endif()
        else(MSVC) # assume gcc
 -              add_definitions("-msse2")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+               add_definitions("-march=native")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          add_definitions("")
</span>   endif(MSVC)
  endmacro()
</pre><pre style='margin:0'>

</pre>