<pre style='margin:0'>
Sean Farley (seanfarley) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d250db665574c4c53644e3b19eef6ada9861a7e4">https://github.com/macports/macports-ports/commit/d250db665574c4c53644e3b19eef6ada9861a7e4</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 d250db6 fftw-3: move configure.args-append down to be executed last
</span>d250db6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d250db665574c4c53644e3b19eef6ada9861a7e4
</span>Author: Sean Farley <sean@macports.org>
AuthorDate: Tue Mar 27 15:00:52 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> fftw-3: move configure.args-append down to be executed last
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously, this was executed too early and appended the sse2 flags to
</span><span style='display:block; white-space:pre;color:#404040;'> configure.args before the fftw-3-long subport had a chance to unset the
</span><span style='display:block; white-space:pre;color:#404040;'> configure_args map.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56146
</span>---
math/fftw-3/Portfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fftw-3/Portfile b/math/fftw-3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e2a4b6..69ad8ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/fftw-3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fftw-3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,10 +91,6 @@ pre-configure {
</span> x86_64 "--enable-sse2"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append $merger_configure_args(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,12 +210,18 @@ if {[fortran_variant_isset]} {
</span> configure.args-delete --disable-fortran
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is put at the bottom to run last (after the sub-port have done their own
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# logic)
</span> pre-configure {
if {[mpi_variant_isset]} {
# MPIRUN is needed for test phase
configure.env MPICC=${mpi.cc} MPIRUN=${mpi.exec}
configure.args-append --enable-mpi
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append $merger_configure_args(${configure.build_arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${name} eq ${subport}} {
</pre><pre style='margin:0'>
</pre>