[144622] trunk/dports/python/py-scipy/Portfile

sean at macports.org sean at macports.org
Wed Jan 13 23:29:25 PST 2016


Revision: 144622
          https://trac.macports.org/changeset/144622
Author:   sean at macports.org
Date:     2016-01-13 23:29:25 -0800 (Wed, 13 Jan 2016)
Log Message:
-----------
py-scipy: fix atlas fortran check; closes #50283

Modified Paths:
--------------
    trunk/dports/python/py-scipy/Portfile

Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile	2016-01-14 07:29:24 UTC (rev 144621)
+++ trunk/dports/python/py-scipy/Portfile	2016-01-14 07:29:25 UTC (rev 144622)
@@ -27,7 +27,8 @@
 python.add_archflags    no
 universal_variant       no
 
-compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 -gcc46 -g95
+compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 -gcc46 \
+                        -gcc47 -gcc48 -g95 clang37
 
 if {${name} ne ${subport}} {
 
@@ -84,25 +85,14 @@
                             BLAS=${prefix}/lib
 
         pre-fetch {
-            # get the c compiler name, if blank set to clang which is what atlas
-            # does
-            set cc [c_variant_name]
-            if {$cc eq ""} {
-                set cc clang
-            }
-
-            # check the C compiler for atlas: if not the same then error out; we
-            # don't need to check the fortran compiler because if atlas is compiled
-            # with +clang then gcc48 (+gfortran in the compilers portgroup
-            # language) is used for fortran. If a +gcc variant is used to compile
-            # atlas, then that gcc's fortran is used so the c compiler check will
-            # suffice.
-            if {![catch {set result [active_variants atlas $cc ""]}]} {
+            # scipy needs fortran; so we only need to check if atlas is
+            # compiled with +nofortran
+            if {![catch {set result [active_variants atlas "" nofortran]}]} {
                 if {!$result} {
                     return -code error \
-"You have selected the $cc compiler (either directly or indirectly) and the\
-+atlas variant, which does not match the $cc compiler. Please ensure that both\
-are compiled with the same one."
+"You have selected the +atlas variant but atlas was built with +nofortran.\
+scipy needs a fortran enabled atlas. Please rebuild atlas without the +nofortran\
+variant."
                 }
             }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160113/5559858b/attachment.html>


More information about the macports-changes mailing list