51ca502b53
* Update python2 to 2.7.11 * Update numpy to 1.10.2 (and number the patches). * New python2 + 3 patch so that sys.version returns something more similar to normal CPython so that get_build_architecture in distutils msvccompiler.py returns the right thing (NumPy uses it so there's every chance other things will too).
53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
--- 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()
|
|
-
|
|
- # 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.
|
|
-
|
|
- 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)
|
|
|
|
# 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
|
|
import tempfile
|
|
+from sysconfig import _POSIX_BUILD
|
|
from subprocess import Popen, PIPE, STDOUT
|
|
|
|
from numpy.distutils.cpuinfo import cpu
|
|
@@ -103,7 +103,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')
|
|
|