From 364fd0906efa349ea44a761820408dcf6b2b8726 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 29 Jan 2019 17:08:32 +0800 Subject: [PATCH] cross compiling support Remove useless dirs Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia Signed-off-by: Leon Anavi --- setup_build.py | 4 ---- setup_configure.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/setup_build.py b/setup_build.py index c0e9a28c..ffd3bef7 100644 --- a/setup_build.py +++ b/setup_build.py @@ -55,10 +55,6 @@ if sys.platform.startswith('win'): ('_HDF5USEDLL_', None), ('H5_BUILT_AS_DYNAMIC_LIB', None) ]) -else: - FALLBACK_PATHS['include_dirs'].extend(['/opt/local/include', '/usr/local/include']) - FALLBACK_PATHS['library_dirs'].extend(['/opt/local/lib', '/usr/local/lib']) - class h5py_build_ext(build_ext): diff --git a/setup_configure.py b/setup_configure.py index 5576775e..75f4141e 100644 --- a/setup_configure.py +++ b/setup_configure.py @@ -206,7 +206,7 @@ def autodetect_version(hdf5_dir=None): default_path = 'libhdf5.so' regexp = re.compile(r'^libhdf5.so') - libdirs = ['/usr/local/lib', '/opt/local/lib'] + libdirs = [] try: if pkgconfig.exists("hdf5"): libdirs.extend(pkgconfig.parse("hdf5")['library_dirs']) -- 2.17.1