<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/5396a98c8beaa40232f3134a477ff518c0c02c7e">https://github.com/macports/macports-ports/commit/5396a98c8beaa40232f3134a477ff518c0c02c7e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5396a98c8beaa40232f3134a477ff518c0c02c7e
</span>Author: Sean Farley <sean@macports.org>
AuthorDate: Sun Mar 25 16:27:36 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> fftw-3: update to 3.3.7 with dstrubbe's patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Thanks to David Strubbe for the patch to update and simplify the port.
</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/55811
</span>---
math/fftw-3/Portfile | 35 ++++++++++----------------------
math/fftw-3/files/yosemite-libtool.patch | 13 ------------
2 files changed, 11 insertions(+), 37 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 55f41c3..6689503 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;'>@@ -6,8 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup mpi 1.0
name fftw-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.7
</span> categories math
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,13 +38,8 @@ long_description \
</span> improvements relative to 2.x, but is not backwardly \
compatible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d5800f3d56b7b499265633b52a0b9850b17c148e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8ecfe1b04732ec3f5b7d279fdb8efcad536d555f9d1e8fabd027037d45ea8bcf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't link with "-flat_namespace -undefined suppress" on Yosemite and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# later (#45707).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yosemite-libtool.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6fb90ce7190190998ff4c579934b76de270db271 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573
</span>
variant pfft_patches description {Apply patches recommended for use as dependency of pfft port} {
if {![mpi_variant_isset]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +91,10 @@ pre-configure {
</span> x86_64 "--enable-sse2"
}
}
<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(${os.arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
test.run yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,23 +108,11 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform powerpc {
</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 --enable-fma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> subport fftw-3-single {
configure.args-append --enable-float
depends_lib port:fftw-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform powerpc {
</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 --enable-altivec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
if { [avx_compiler_isset] == 1 } {
array set merger_configure_args {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,13 +130,14 @@ subport fftw-3-single {
</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(${os.arch})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform i386 {
if {![variant_isset universal]} {
configure.args-delete --enable-sse2
configure.args-append --enable-sse
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [avx_compiler_isset] == 1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-avx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fftw-3/files/yosemite-libtool.patch b/math/fftw-3/files/yosemite-libtool.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 710e18f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/fftw-3/files/yosemite-libtool.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8703,7 +8703,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span></pre><pre style='margin:0'>
</pre>