Modified: trunk/dports/math/scalapack/Portfile (148862 => 148863)
--- trunk/dports/math/scalapack/Portfile 2016-05-20 15:27:07 UTC (rev 148862)
+++ trunk/dports/math/scalapack/Portfile 2016-05-20 15:46:02 UTC (rev 148863)
@@ -4,6 +4,7 @@
PortSystem 1.0
PortGroup cmake 1.0
PortGroup mpi 1.0
+PortGroup linear_algebra 1.0
name scalapack
version 2.0.2
@@ -40,32 +41,12 @@
append portsandbox_profile " (allow process-exec (literal \"/bin/ps\") (with no-profile))"
}
-if {![variant_isset atlas] && ![variant_isset openblas]} {
- default_variants-append +accelerate
-}
-
-variant accelerate conflicts atlas openblas description {Use built-in Accelerate for BLAS and LAPACK} {
- depends_lib-append port:vecLibFort
- configure.args-append -DLAPACK_LIBRARIES=${prefix}/lib/libvecLibFort.dylib
-}
-
-variant openblas conflicts accelerate atlas description {Use OpenBLAS for BLAS and LAPACK} {
- # allow OpenBLAS-devel too
- depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
- require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
- configure.args-append -DLAPACK_LIBRARIES=${prefix}/lib/libopenblas.dylib
-}
-
-variant atlas conflicts accelerate openblas description {Use ATLAS for BLAS and LAPACK} {
- depends_lib-append port:atlas
- configure.args-append -DLAPACK_LIBRARIES=${prefix}/lib/libsatlas.dylib
-}
-
pre-configure {
configure.args-append \
-DMPI_C_COMPILER=${mpi.cc} \
-DMPI_Fortran_COMPILER=${mpi.fc} \
- -DMPIEXEC=${prefix}/bin/${mpi.exec}
+ -DMPIEXEC=${prefix}/bin/${mpi.exec} \
+ -DLAPACK_LIBRARIES="-L${prefix} ${linalglib}"
}
livecheck.type regex