python-h5py: try to update

still doesn't build...
This commit is contained in:
Christoph Reiter
2021-07-14 20:56:30 +02:00
parent ae2205c158
commit 243a8b57b5
2 changed files with 24 additions and 21 deletions

View File

@@ -23,20 +23,20 @@
COMPILER_SETTINGS['include_dirs'].append(localpath('windows'))
COMPILER_SETTINGS['define_macros'].extend([
('_HDF5USEDLL_', None),
--- h5py-2.10.0/setup_configure.py.orig 2019-10-28 06:39:22.882866000 +0300
+++ h5py-2.10.0/setup_configure.py 2019-10-28 06:45:46.958833800 +0300
@@ -200,8 +200,12 @@
regexp = re.compile(r'^libhdf5.dylib')
elif sys.platform.startswith('win') or \
sys.platform.startswith('cygwin'):
- default_path = 'hdf5.dll'
- regexp = re.compile(r'^hdf5.dll')
+ if 'GCC' in sys.version:
+ default_path = 'libhdf5-0.dll'
+ regexp = re.compile(r'^libhdf5-[0-9].dll')
+ else:
+ default_path = 'hdf5.dll'
+ regexp = re.compile(r'^hdf5.dll')
else:
default_path = 'libhdf5.so'
regexp = re.compile(r'^libhdf5.so')
--- h5py-3.3.0/setup_configure.py.orig 2021-07-14 20:32:17.516742500 +0200
+++ h5py-3.3.0/setup_configure.py 2021-07-14 20:34:00.998030600 +0200
@@ -202,8 +202,12 @@
regexp = re.compile(r'^libhdf5.dylib')
elif sys.platform.startswith('win') or \
sys.platform.startswith('cygwin'):
- default_path = 'hdf5.dll'
- regexp = re.compile(r'^hdf5.dll')
+ if 'GCC' in sys.version:
+ default_path = 'libhdf5-0.dll'
+ regexp = re.compile(r'^libhdf5-[0-9].dll')
+ else:
+ default_path = 'hdf5.dll'
+ regexp = re.compile(r'^hdf5.dll')
if sys.version_info >= (3, 8):
# To overcome "difficulty" loading the library on windows
# https://bugs.python.org/issue42114