diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch')
-rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch index ff50c85a0..8c0b91432 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch @@ -1,4 +1,4 @@ -From 7e3b1745c1fef34683a0610381dd3308ad4d1ba9 Mon Sep 17 00:00:00 2001 +From 364fd0906efa349ea44a761820408dcf6b2b8726 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Tue, 29 Jan 2019 17:08:32 +0800 Subject: [PATCH] cross compiling support @@ -8,16 +8,17 @@ Remove useless dirs Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- 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 85b321a..2c78e92 100644 +index c0e9a28c..ffd3bef7 100644 --- a/setup_build.py +++ b/setup_build.py -@@ -53,10 +53,6 @@ if sys.platform.startswith('win'): +@@ -55,10 +55,6 @@ if sys.platform.startswith('win'): ('_HDF5USEDLL_', None), ('H5_BUILT_AS_DYNAMIC_LIB', None) ]) @@ -29,11 +30,11 @@ index 85b321a..2c78e92 100644 class h5py_build_ext(build_ext): diff --git a/setup_configure.py b/setup_configure.py -index a2de76a..197f2da 100644 +index 5576775e..75f4141e 100644 --- a/setup_configure.py +++ b/setup_configure.py -@@ -208,7 +208,7 @@ def autodetect_version(hdf5_dir=None): - else: +@@ -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'] @@ -42,5 +43,5 @@ index a2de76a..197f2da 100644 if pkgconfig.exists("hdf5"): libdirs.extend(pkgconfig.parse("hdf5")['library_dirs']) -- -2.7.4 +2.17.1 |