| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 7e3b1745c1fef34683a0610381dd3308ad4d1ba9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 29 Jan 2019 17:08:32 +0800 |
| 4 | Subject: [PATCH] cross compiling support |
| 5 | |
| 6 | Remove useless dirs |
| 7 | |
| 8 | Upstream-Status: Inappropriate [oe specific] |
| 9 | |
| 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 11 | --- |
| 12 | setup_build.py | 4 ---- |
| 13 | setup_configure.py | 2 +- |
| 14 | 2 files changed, 1 insertion(+), 5 deletions(-) |
| 15 | |
| 16 | diff --git a/setup_build.py b/setup_build.py |
| 17 | index 85b321a..2c78e92 100644 |
| 18 | --- a/setup_build.py |
| 19 | +++ b/setup_build.py |
| 20 | @@ -53,10 +53,6 @@ if sys.platform.startswith('win'): |
| 21 | ('_HDF5USEDLL_', None), |
| 22 | ('H5_BUILT_AS_DYNAMIC_LIB', None) |
| 23 | ]) |
| 24 | -else: |
| 25 | - FALLBACK_PATHS['include_dirs'].extend(['/opt/local/include', '/usr/local/include']) |
| 26 | - FALLBACK_PATHS['library_dirs'].extend(['/opt/local/lib', '/usr/local/lib']) |
| 27 | - |
| 28 | |
| 29 | class h5py_build_ext(build_ext): |
| 30 | |
| 31 | diff --git a/setup_configure.py b/setup_configure.py |
| 32 | index a2de76a..197f2da 100644 |
| 33 | --- a/setup_configure.py |
| 34 | +++ b/setup_configure.py |
| 35 | @@ -208,7 +208,7 @@ def autodetect_version(hdf5_dir=None): |
| 36 | else: |
| 37 | regexp = re.compile(r'^libhdf5.so') |
| 38 | |
| 39 | - libdirs = ['/usr/local/lib', '/opt/local/lib'] |
| 40 | + libdirs = [] |
| 41 | try: |
| 42 | if pkgconfig.exists("hdf5"): |
| 43 | libdirs.extend(pkgconfig.parse("hdf5")['library_dirs']) |
| 44 | -- |
| 45 | 2.7.4 |
| 46 | |