Blob Blame History Raw
diff -up h5py-2.7.0/lzf/lzf_filter.c.lzf h5py-2.7.0/lzf/lzf_filter.c
--- h5py-2.7.0/lzf/lzf_filter.c.lzf	2016-12-17 16:12:17.000000000 -0700
+++ h5py-2.7.0/lzf/lzf_filter.c	2017-03-20 12:12:42.416002681 -0600
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include "hdf5.h"
-#include "lzf/lzf.h"
+#include "lzf.h"
 #include "lzf_filter.h"
 
 /* Our own versions of H5Epush_sim, as it changed in 1.8 */
diff -up h5py-2.7.0/setup_build.py.lzf h5py-2.7.0/setup_build.py
--- h5py-2.7.0/setup_build.py.lzf	2016-12-17 16:12:17.000000000 -0700
+++ h5py-2.7.0/setup_build.py	2017-03-20 12:14:01.575626772 -0600
@@ -31,12 +31,10 @@ MODULES =  ['defs','_errors','_objects',
             'h5ds', 'h5ac']
 
 
-EXTRA_SRC = {'h5z': [ localpath("lzf/lzf_filter.c"),
-              localpath("lzf/lzf/lzf_c.c"),
-              localpath("lzf/lzf/lzf_d.c")]}
+EXTRA_SRC = {'h5z': [ localpath("lzf/lzf_filter.c")]}
 
 COMPILER_SETTINGS = {
-   'libraries'      : ['hdf5', 'hdf5_hl'],
+   'libraries'      : ['hdf5', 'hdf5_hl', 'lzf'],
    'include_dirs'   : [localpath('lzf')],
    'library_dirs'   : [],
    'define_macros'  : [('H5_USE_16_API', None)]
@@ -103,10 +101,6 @@ class h5py_build_ext(build_ext):
             settings['include_dirs'].insert(0, op.join(config.hdf5, 'include'))
             settings['library_dirs'].insert(0, op.join(config.hdf5, 'lib'))
 
-        # TODO: should this only be done on UNIX?
-        if os.name != 'nt':
-            settings['runtime_library_dirs'] = settings['library_dirs']
-
         def make_extension(module):
             sources = [localpath('h5py', module+'.pyx')] + EXTRA_SRC.get(module, [])
             return Extension('h5py.'+module, sources, **settings)