[144621] trunk/dports/python/py-numpy/Portfile

[sean at macports.org]

Revision: 144621
          https://trac.macports.org/changeset/144621
Author:   sean at macports.org
Date:     2016-01-13 23:29:24 -0800 (Wed, 13 Jan 2016)
Log Message:
-----------
py-numpy: numpy needs fortran, so require it

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2016-01-14 07:29:23 UTC (rev 144620)
+++ trunk/dports/python/py-numpy/Portfile	2016-01-14 07:29:24 UTC (rev 144621)
@@ -38,7 +38,8 @@
 #universal_variant no
 
 if {${name} ne ${subport}} {
-    compilers.setup         -dragonegg -gcc44 -gcc45 -gcc46 -g95
+    compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 -gcc46 \
+                            -gcc47 -gcc48 -g95 clang37
 
     patchfiles              patch-f2py_setup.py.diff \
                             patch-fcompiler_g95.diff \
@@ -83,21 +84,14 @@
         patchfiles-append       patch-numpy_linalg_setup.py.diff
 
         pre-fetch {
-            # get the c compiler name
-            set cc [c_variant_name]
-
-            # 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 ""]}]} {
+            # numpy 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.\
+numpy 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/e33ba0e9/attachment.html>