numpy: Update to 1.8.2

This commit is contained in:
Alexpux
2014-08-29 13:02:57 +04:00
parent 66664b3f48
commit 6ce929ba91
3 changed files with 44 additions and 5 deletions

View File

@@ -25,6 +25,32 @@
#self.set_executables(compiler='gcc -mno-cygwin -O2 -w',
--- numpy-py2-1.8.0/numpy/distutils/fcompiler/gnu.py 2014-02-19 01:27:32.252800000 +0400
+++ numpy-1.8.0/numpy/distutils/fcompiler/gnu.py 2014-02-19 01:31:29.804200000 +0400
@@ -6,6 +6,7 @@
import warnings
import platform
import tempfile
+from sysconfig import _POSIX_BUILD
from subprocess import Popen, PIPE, STDOUT
from numpy.distutils.cpuinfo import cpu
@@ -86,7 +87,7 @@
pic_flags = ['-fPIC']
# use -mno-cygwin for g77 when Python is not Cygwin-Python
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not _POSIX_BUILD:
for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
executables[key].append('-mno-cygwin')
@@ -235,7 +236,7 @@
pass
else:
# use -mno-cygwin flag for gfortran when Python is not Cygwin-Python
- if sys.platform == 'win32':
+ if sys.platform == 'win32' and not _POSIX_BUILD:
for key in ['version_cmd', 'compiler_f77', 'compiler_f90',
'compiler_fix', 'linker_so', 'linker_exe']:
self.executables[key].append('-mno-cygwin')
@@ -324,13 +324,6 @@
i = opt.index("gcc")
opt.insert(i+1, "mingwex")