diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
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 | 46 |
1 files changed, 46 insertions, 0 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 new file mode 100644 index 000000000..ff50c85a0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py/0001-cross-compiling-support.patch @@ -0,0 +1,46 @@ +From 7e3b1745c1fef34683a0610381dd3308ad4d1ba9 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 + +Remove useless dirs + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.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 +--- a/setup_build.py ++++ b/setup_build.py +@@ -53,10 +53,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 a2de76a..197f2da 100644 +--- a/setup_configure.py ++++ b/setup_configure.py +@@ -208,7 +208,7 @@ def autodetect_version(hdf5_dir=None): + else: + 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.7.4 + |