Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

numpy: Update to 1.10.0

Browse Source
This commit is contained in:
Alexey Pavlov
2015-10-08 15:32:52 +03:00
parent e9ddef86a1
commit 4b60e4c1d9
7 changed files with 186 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
mingw-w64-python-numpy/fix-finding-python2.patch
View File

@@ -1,30 +1,38 @@
--- numpy-py2-1.8.0/numpy/distutils/mingw32ccompiler.py 2014-02-19 01:07:43.787600000 +0400
+++ numpy-1.8.0/numpy/distutils/mingw32ccompiler.py 2014-02-19 01:26:21.634200000 +0400
@@ -86,22 +86,6 @@
self.linker = 'g++'
# **changes: eric jones 4/11/01
- # 1. Check for import library on Windows. Build if it doesn't exist.
--- numpy-py2-1.10.0/numpy/distutils/mingw32ccompiler.py 2014-02-19 01:07:43.787600000 +0400
+++ numpy-1.10.0/numpy/distutils/mingw32ccompiler.py 2014-02-19 01:26:21.634200000 +0400
@@ -91,30 +91,6 @@
stdout=subprocess.PIPE)
out_string = p.stdout.read()
p.stdout.close()
-
- build_import_library()
- # Before build with MinGW-W64 generate the python import library
- # with gendef and dlltool according to the MingW-W64 FAQ.
- # Use the MinGW-W64 provided msvc runtime import libraries.
- # Don't call build_import_library() and build_msvcr_library.
-
- # Check for custom msvc runtime library on Windows. Build if it doesn't exist.
- msvcr_success = build_msvcr_library()
- msvcr_dbg_success = build_msvcr_library(debug=True)
- if msvcr_success or msvcr_dbg_success:
- # add preprocessor statement for using customized msvcr lib
- self.define_macro('NPY_MINGW_USE_CUSTOM_MSVCR')
- if 'MinGW-W64' not in str(out_string):
-
- # **changes: eric jones 4/11/01
- # 1. Check for import library on Windows. Build if it doesn't
- # exist.
- build_import_library()
-
- # Check for custom msvc runtime library on Windows. Build if it
- # doesn't exist.
- msvcr_success = build_msvcr_library()
- msvcr_dbg_success = build_msvcr_library(debug=True)
- if msvcr_success or msvcr_dbg_success:
- # add preprocessor statement for using customized msvcr lib
- self.define_macro('NPY_MINGW_USE_CUSTOM_MSVCR')
-
- # Define the MSVC version as hint for MinGW
- msvcr_version = '0x%03i0' % int(msvc_runtime_library().lstrip('msvcr'))
- self.define_macro('__MSVCRT_VERSION__', msvcr_version)
-
- # **changes: eric jones 4/11/01
# 2. increased optimization and turned off all warnings
# 3. also added --driver-name g++
#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
# MS_WIN64 should be defined when building for amd64 on windows,
# but python headers define it only for MS compilers, which has all
--- numpy-py2-1.10.0/numpy/distutils/fcompiler/gnu.py 2014-02-19 01:27:32.252800000 +0400
+++ numpy-1.10.0/numpy/distutils/fcompiler/gnu.py 2014-02-19 01:31:29.804200000 +0400
@@ -6,6 +6,7 @@
import warnings
import platform
@@ -33,7 +41,7 @@
from subprocess import Popen, PIPE, STDOUT
from numpy.distutils.cpuinfo import cpu
@@ -86,7 +87,7 @@
@@ -103,7 +103,7 @@
pic_flags = ['-fPIC']
# use -mno-cygwin for g77 when Python is not Cygwin-Python
@@ -42,26 +50,3 @@
for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
executables[key].append('-mno-cygwin')
@@ -238,7 +239,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')
@@ -328,13 +328,6 @@
i = opt.index("gcc")
opt.insert(i+1, "mingwex")
opt.insert(i+1, "mingw32")
- # XXX: fix this mess, does not work for mingw
- if is_win64():
- c_compiler = self.c_compiler
- if c_compiler and c_compiler.compiler_type == "msvc":
- return []
- else:
- raise NotImplementedError("Only MS compiler supported with gfortran on win64")
return opt
def get_target(self):