25316f28f3
* mingw-w64-xapian-core - 1.4.1 - add epoch and include libtool.la file for a config script.
* Revert "scite: Update to v3.7.1"
This reverts commit 799e9aa437.
* Revert "Revert "scite: Update to v3.7.1""
This reverts commit ff2f893be539d50dba9e1450f24c1a8c85fa4836.
* Updates to some python packages
mingw-w64-cython: 0.25.2 - Update to latest version
mingw-w64-libplist - 1.12 - rebuild
mingw-w64-python-babel - 2.3.4 - Update to latest version, rework build process, drop GIT
mingw-w64-python-dateutil - 2.6.0 - Update to latest version
mingw-w64-python-numpy - 1.11.2 - Update to latest version
mingw-w64-python-pandas - 0.19.1 - Update to latest version and rework build process
mingw-w64-python-pip - 9.0.1 - Update to latest version
mingw-w64-python-pytz - 2016.10 - Update to latest version
mingw-w64-python-setuptools - 31.0.0 - Update to latest version
mingw-w64-python-sphinx-alabaster-theme - 0.7.9 - Update to latest version
mingw-w64-python-sphinx - 1.5 - Update to latest version and rework build process.
25 lines
1.4 KiB
Diff
25 lines
1.4 KiB
Diff
diff -urN numpy-1.10.2.orig/numpy/distutils/fcompiler/compaq.py numpy-1.10.2/numpy/distutils/fcompiler/compaq.py
|
|
--- numpy-1.10.2.orig/numpy/distutils/fcompiler/compaq.py 2016-01-04 00:44:11.333672900 +0000
|
|
+++ numpy-1.10.2/numpy/distutils/fcompiler/compaq.py 2016-01-04 00:46:47.573905500 +0000
|
|
@@ -10,7 +10,7 @@
|
|
from distutils.errors import DistutilsPlatformError
|
|
|
|
compilers = ['CompaqFCompiler']
|
|
-if os.name != 'posix' or sys.platform[:6] == 'cygwin' :
|
|
+if (os.name != 'posix' or sys.platform[:6] == 'cygwin') and not 'GCC' in sys.version:
|
|
# Otherwise we'd get a false positive on posix systems with
|
|
# case-insensitive filesystems (like darwin), because we'll pick
|
|
# up /bin/df
|
|
diff -aur numpy-1.11.2/numpy/distutils/msvccompiler.py.orig numpy-1.11.2/numpy/distutils/msvccompiler.py
|
|
--- numpy-1.11.2/numpy/distutils/msvccompiler.py.orig 2016-12-12 14:41:40.479160800 -0500
|
|
+++ numpy-1.11.2/numpy/distutils/msvccompiler.py 2016-12-12 14:45:23.036996800 -0500
|
|
@@ -47,7 +47,7 @@
|
|
# by MSVCCompiler.initialize, so save them for later merge.
|
|
environ_lib = os.getenv('lib', '')
|
|
environ_include = os.getenv('include', '')
|
|
- _MSVCCompiler.initialize(self, plat_name)
|
|
+ _MSVCCompiler.initialize(self)
|
|
|
|
# Merge current and previous values of 'lib' and 'include'
|
|
os.environ['lib'] = _merge(environ_lib, os.environ['lib'])
|