Modified: trunk/dports/math/itsol/Portfile (148860 => 148861)
--- trunk/dports/math/itsol/Portfile 2016-05-20 14:49:31 UTC (rev 148860)
+++ trunk/dports/math/itsol/Portfile 2016-05-20 15:16:55 UTC (rev 148861)
@@ -4,6 +4,7 @@
PortSystem 1.0
PortGroup muniversal 1.0
PortGroup compilers 1.0
+PortGroup linear_algebra 1.0
name itsol
version 2.0.0
@@ -42,44 +43,6 @@
compilers.choose fc
compilers.setup require_fortran
-variant atlas description {use BLAS from MacPorts' atlas port} \
- conflicts accelerate {}
-
-variant accelerate description \
- {use BLAS from Apple's Accelerate.framework} \
- conflicts atlas {}
-
-set blas_variant_selection ""
-if {[variant_isset accelerate]} {
- set blas_variant_selection "accelerate"
-} else {
- set blas_variant_selection "atlas"
-}
-
-default_variants +${blas_variant_selection}
-
-# make sure that either +accelerate or +atlas is selected
-
-if {![variant_isset accelerate] && ![variant_isset atlas]} {
- ui_error "\n\nYou cannot use the -${blas_variant_selection} variant alone; you must select either the +accelerate or +atlas variant.\n"
- return -code error "Invalid variant selection"
-}
-
-#######################
-# figure out BLAS flags
-
-if {[variant_isset accelerate]} {
-
- depends_lib-append port:vecLibFort
- configure.ldflags-append -lvecLibFort
-
-} else {
-
- depends_lib-append port:atlas
- configure.ldflags-append -lsatlas
-
-}
-
##########################
# configure MacPorts build
@@ -90,6 +53,10 @@
configure.universal_args
destroot.env-append PREFIX=${prefix}
+pre-configure {
+ configure.ldflags-append "${linalglib}"
+}
+
test.run yes
pre-test {
test.args-append LINKS="-L../LIB -litsol" \