diff options
Diffstat (limited to 'meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch b/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch deleted file mode 100644 index 8c0b914326..0000000000 --- a/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | From 364fd0906efa349ea44a761820408dcf6b2b8726 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 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | ||
12 | --- | ||
13 | setup_build.py | 4 ---- | ||
14 | setup_configure.py | 2 +- | ||
15 | 2 files changed, 1 insertion(+), 5 deletions(-) | ||
16 | |||
17 | diff --git a/setup_build.py b/setup_build.py | ||
18 | index c0e9a28c..ffd3bef7 100644 | ||
19 | --- a/setup_build.py | ||
20 | +++ b/setup_build.py | ||
21 | @@ -55,10 +55,6 @@ if sys.platform.startswith('win'): | ||
22 | ('_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 | |||
32 | diff --git a/setup_configure.py b/setup_configure.py | ||
33 | index 5576775e..75f4141e 100644 | ||
34 | --- a/setup_configure.py | ||
35 | +++ b/setup_configure.py | ||
36 | @@ -206,7 +206,7 @@ def autodetect_version(hdf5_dir=None): | ||
37 | default_path = 'libhdf5.so' | ||
38 | 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 | -- | ||
46 | 2.17.1 | ||
47 | |||