[148973] trunk/dports/math/qrupdate/Portfile

[dstrubbe at macports.org]

Revision: 148973
          https://trac.macports.org/changeset/148973
Author:   dstrubbe at macports.org
Date:     2016-05-23 18:49:14 -0700 (Mon, 23 May 2016)
Log Message:
-----------
qrupdate: Use linear_algebra port group. This corrects the wrong description of +openblas too.

Modified Paths:
--------------
    trunk/dports/math/qrupdate/Portfile

Modified: trunk/dports/math/qrupdate/Portfile
===================================================================
--- trunk/dports/math/qrupdate/Portfile	2016-05-24 01:25:06 UTC (rev 148972)
+++ trunk/dports/math/qrupdate/Portfile	2016-05-24 01:49:14 UTC (rev 148973)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 PortGroup           muniversal 1.0
 PortGroup           compilers 1.0
+PortGroup           linear_algebra 1.0
 
 compilers.choose    fc
 compilers.setup     require_fortran -dragonegg
@@ -28,9 +29,9 @@
 use_configure       no
 build.target        lib solib
 
-build.args          PREFIX=${prefix}
-destroot.args       PREFIX=${prefix}
-test.args           PREFIX=${prefix}
+build.args          PREFIX=${prefix} LAPACK=""
+destroot.args       PREFIX=${prefix} LAPACK=""
+test.args           PREFIX=${prefix} LAPACK=""
 
 patchfiles          patch-Makefile.diff
 
@@ -42,7 +43,7 @@
     reinplace "s|ar -cr |libtool -o |"  ${worksrcpath}/src/Makefile
 }
 
-# Fortran compilers can not cross-compile
+# Fortran compilers cannot cross-compile
 if {${os.arch} eq "i386"} {
     set universal_archs_supported "i386 x86_64"
 } else {
@@ -65,43 +66,12 @@
             }
         }
     }
-}
 
-variant atlas conflicts accelerate openblas description {build with atlas instead of Accelerate framework} {
-    depends_lib-append      port:atlas
-    build.args-append       BLAS=-ltatlas LAPACK=-llapack
-    destroot.args-append    BLAS=-ltatlas LAPACK=-llapack
-    test.args-append        BLAS=-ltatlas LAPACK=-llapack
+    build.args-append       BLAS="${linalglib}"
+    destroot.args-append    BLAS="${linalglib}"
+    test.args-append        BLAS="${linalglib}"
 }
 
-variant accelerate conflicts atlas openblas description {build with Accelerate framework} {
-    depends_lib-append      port:vecLibFort
-    build.args-append       BLAS=-lvecLibFort LAPACK=-lvecLibFort
-    destroot.args-append    BLAS=-lvecLibFort LAPACK=-lvecLibFort
-    test.args-append        BLAS=-lvecLibFort LAPACK=-lvecLibFort
-}
-
-variant openblas conflicts accelerate atlas description {build with Accelerate framework} {
-    PortGroup               active_variants 1.1
-
-    depends_lib-append      path:lib/libopenblas.dylib:OpenBLAS
-    # LAPACK required
-    require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
-
-    build.args-append       BLAS=-lopenblas   LAPACK=-lopenblas
-    destroot.args-append    BLAS=-lopenblas   LAPACK=-lopenblas
-    test.args-append        BLAS=-lopenblas   LAPACK=-lopenblas
-}
-
-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
-    default_variants-append +accelerate
-}
-
-if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
-    ui_error "\n\nYou must select either the +accelerate, +atlas, or +openblas variant.\n"
-    return -code error "Invalid variant selection"
-}
-
 if {[variant_isset g95]} {
     post-patch {
         reinplace "s|Makeconf|Makeconf.g95|" ${worksrcpath}/Makefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160523/02cc7cbf/attachment.html>