blob: 8c0b914326a96657ffd3d8283b4efb8592ab8262 [file] [log] [blame]
Andrew Geisslerd221e032020-07-10 16:13:21 -05001From 364fd0906efa349ea44a761820408dcf6b2b8726 Mon Sep 17 00:00:00 2001
Brad Bishop19323692019-04-05 15:28:33 -04002From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 29 Jan 2019 17:08:32 +0800
4Subject: [PATCH] cross compiling support
5
6Remove useless dirs
7
8Upstream-Status: Inappropriate [oe specific]
9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Andrew Geisslerd221e032020-07-10 16:13:21 -050011Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Brad Bishop19323692019-04-05 15:28:33 -040012---
13 setup_build.py | 4 ----
14 setup_configure.py | 2 +-
15 2 files changed, 1 insertion(+), 5 deletions(-)
16
17diff --git a/setup_build.py b/setup_build.py
Andrew Geisslerd221e032020-07-10 16:13:21 -050018index c0e9a28c..ffd3bef7 100644
Brad Bishop19323692019-04-05 15:28:33 -040019--- a/setup_build.py
20+++ b/setup_build.py
Andrew Geisslerd221e032020-07-10 16:13:21 -050021@@ -55,10 +55,6 @@ if sys.platform.startswith('win'):
Brad Bishop19323692019-04-05 15:28:33 -040022 ('_HDF5USEDLL_', None),
23 ('H5_BUILT_AS_DYNAMIC_LIB', None)
24 ])
25-else:
26- FALLBACK_PATHS['include_dirs'].extend(['/opt/local/include', '/usr/local/include'])
27- FALLBACK_PATHS['library_dirs'].extend(['/opt/local/lib', '/usr/local/lib'])
28-
29
30 class h5py_build_ext(build_ext):
31
32diff --git a/setup_configure.py b/setup_configure.py
Andrew Geisslerd221e032020-07-10 16:13:21 -050033index 5576775e..75f4141e 100644
Brad Bishop19323692019-04-05 15:28:33 -040034--- a/setup_configure.py
35+++ b/setup_configure.py
Andrew Geisslerd221e032020-07-10 16:13:21 -050036@@ -206,7 +206,7 @@ def autodetect_version(hdf5_dir=None):
37 default_path = 'libhdf5.so'
Brad Bishop19323692019-04-05 15:28:33 -040038 regexp = re.compile(r'^libhdf5.so')
39
40- libdirs = ['/usr/local/lib', '/opt/local/lib']
41+ libdirs = []
42 try:
43 if pkgconfig.exists("hdf5"):
44 libdirs.extend(pkgconfig.parse("hdf5")['library_dirs'])
45--
Andrew Geisslerd221e032020-07-10 16:13:21 -0500462.17.1
Brad Bishop19323692019-04-05 15:28:33 -040047