[110208] trunk/dports/math/fftw-3/Portfile
jeremyhu at macports.org
jeremyhu at macports.org
Wed Aug 28 08:23:32 PDT 2013
Revision: 110208
https://trac.macports.org/changeset/110208
Author: jeremyhu at macports.org
Date: 2013-08-28 08:23:32 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
fftw-3: Don't default to making fortran support available (matces prefortran-recipe usage). Closes #40272.
Modified Paths:
--------------
trunk/dports/math/fftw-3/Portfile
Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile 2013-08-28 15:14:20 UTC (rev 110207)
+++ trunk/dports/math/fftw-3/Portfile 2013-08-28 15:23:32 UTC (rev 110208)
@@ -5,7 +5,7 @@
name fftw-3
version 3.3.3
-revision 2
+revision 3
categories math
license GPL-2+
platforms darwin
@@ -43,6 +43,7 @@
configure.args \
--enable-threads \
+ --disable-fortran \
--enable-shared
configure.cflags-append \
@@ -179,7 +180,6 @@
}
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
set g95_conflicts {}
foreach ver ${gcc_versions} {
@@ -200,26 +200,10 @@
eval $variant_line
append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
}
eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
- }
-}
-
-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
-}
-
foreach ver ${gcc_versions} {
set ver_no_dot [join [split ${ver} "."] ""]
@@ -227,12 +211,33 @@
depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
depends_build-append port:gcc${ver_no_dot}
+ configure.args-delete --disable-fortran
+
configure.fc ${prefix}/bin/gfortran-mp-${ver}
configure.f77 ${prefix}/bin/gfortran-mp-${ver}
configure.f90 ${prefix}/bin/gfortran-mp-${ver}
}
}
+if {[variant_isset g95]} {
+ depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
+ depends_build-append port:g95
+
+ configure.args-delete --disable-fortran
+
+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
+
+ if {${build_arch} == "i386"} {
+ lappend merger_configure_args(x86_64) "--disable-fortran"
+ } elseif {${build_arch} == "x86_64"} {
+ lappend merger_configure_args(i386) "--disable-fortran"
+ } else {
+ lappend merger_configure_args(ppc64) "--disable-fortran"
+ }
+}
+
variant openmpi description {compile FFTW MPI library with OpenMPI} conflicts mpich {
depends_lib-append port:openmpi
configure.env MPICC=${prefix}/lib/openmpi/bin/mpicc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/9f240ac1/attachment.html>
More information about the macports-changes
mailing list