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

python-numpy: Update to 0.13.0

Browse Source
This commit is contained in:
Alexey Pavlov
2017-06-17 19:08:22 +03:00
parent 88ee9c44d6
commit 583d6b75d0
3 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/numpy/distutils/mingw32ccompiler.py
--- numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py 2015-11-12 20:04:51.000000000 +0000
+++ numpy-1.10.2/numpy/distutils/mingw32ccompiler.py 2016-01-02 03:35:27.818684200 +0000
@@ -87,21 +87,23 @@
diff -urN numpy-1.13.0.orig/numpy/distutils/mingw32ccompiler.py numpy-1.13.0/numpy/distutils/mingw32ccompiler.py
--- numpy-1.13.0.orig/numpy/distutils/mingw32ccompiler.py 2015-11-12 20:04:51.000000000 +0000
+++ numpy-1.13.0/numpy/distutils/mingw32ccompiler.py 2016-01-02 03:35:27.818684200 +0000
@@ -98,22 +98,24 @@
elif self.linker_dll == 'gcc':
self.linker = 'g++'
@@ -21,8 +21,9 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/num
- 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)
- msvcr_version = msvc_runtime_version()
- if msvcr_version:
- self.define_macro('__MSVCRT_VERSION__', '0x%04i' % msvcr_version)
+ build_import_library()
+
+ # Check for custom msvc runtime library on Windows. Build if it doesn't exist.
@@ -33,8 +34,9 @@ diff -urN numpy-1.10.2.orig/numpy/distutils/mingw32ccompiler.py numpy-1.10.2/num
+ 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)
+ msvcr_version = msvc_runtime_version()
+ if msvcr_version:
+ self.define_macro('__MSVCRT_VERSION__', '0x%04i' % msvcr_version)
# MS_WIN64 should be defined when building for amd64 on windows,
# but python headers define it only for MS compilers, which has all