[112767] trunk/dports/python/py-numpy

[stromnov at macports.org]

Revision: 112767
          https://trac.macports.org/changeset/112767
Author:   stromnov at macports.org
Date:     2013-10-31 03:24:38 -0700 (Thu, 31 Oct 2013)
Log Message:
-----------
py-numpy: fix fortran compiler issue (#40824)

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

Added Paths:
-----------
    trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2013-10-31 10:24:15 UTC (rev 112766)
+++ trunk/dports/python/py-numpy/Portfile	2013-10-31 10:24:38 UTC (rev 112767)
@@ -7,7 +7,7 @@
 
 github.setup            numpy numpy 1.7.1 v
 name                    py-numpy
-revision                0
+revision                1
 dist_subdir             ${name}/${version}_1
 
 categories-append       math
@@ -24,6 +24,7 @@
 
 if {$subport != $name} {
     patchfiles              patch-f2py_setup.py.diff \
+                            patch-numpy_distutils_fcompiler___init__.py.diff \
                             patch-fcompiler_g95.diff
 
     depends_lib-append      port:fftw-3 \

Added: trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff	                        (rev 0)
+++ trunk/dports/python/py-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff	2013-10-31 10:24:38 UTC (rev 112767)
@@ -0,0 +1,30 @@
+--- numpy/distutils/fcompiler/__init__.py.orig	2013-10-31 13:24:12.000000000 +0400
++++ numpy/distutils/fcompiler/__init__.py	2013-10-31 13:45:03.000000000 +0400
+@@ -815,7 +815,7 @@
+     return compiler_type
+ 
+ # Flag to avoid rechecking for Fortran compiler every time
+-failed_fcompiler = False
++failed_fcompilers = []
+ 
+ def new_fcompiler(plat=None,
+                   compiler=None,
+@@ -828,7 +828,8 @@
+     platform/compiler combination.
+     """
+     global failed_fcompiler
+-    if failed_fcompiler:
++    fcompiler_key = (plat, compiler)
++    if fcompiler_key in failed_fcompilers:
+         return None
+ 
+     load_all_fcompiler_classes()
+@@ -848,7 +849,7 @@
+             msg = msg + " Supported compilers are: %s)" \
+                   % (','.join(fcompiler_class.keys()))
+         log.warn(msg)
+-        failed_fcompiler = True
++        failed_fcompilers.append(fcompiler_key)
+         return None
+ 
+     compiler = klass(verbose=verbose, dry_run=dry_run, force=force)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131031/cf112323/attachment.html>