diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-02-15 01:04:47 -0500 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-02-17 12:21:27 -0800 |
commit | 293fac92416b0bea72549159b2050ccde573d12d (patch) | |
tree | bab88bdc95b42da526684b9a8ad6d49e1b0c2543 /meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch | |
parent | 2032f0f4d5aa0f443516d53452858469cffbbee7 (diff) | |
download | meta-openembedded-293fac92416b0bea72549159b2050ccde573d12d.tar.gz |
hdf5: add version 1.8.19
License HDF5 is BSD-style.
https://support.hdfgroup.org/products/licenses.html
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch')
-rw-r--r-- | meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch b/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch new file mode 100644 index 0000000000..97f16bbc0b --- /dev/null +++ b/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch @@ -0,0 +1,71 @@ +From 1b4fadf550587b46e405d7ccb777dcb00aa791a2 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Tue, 29 Jan 2019 15:39:15 +0800 +Subject: [PATCH 1/2] cross compiling support + +Do not generate config files at build time, use pre-generated +files to instead. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + CMakeLists.txt | 6 ++++++ + src/CMakeLists.txt | 23 ----------------------- + 2 files changed, 6 insertions(+), 23 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08a65c4..9af14d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -817,4 +817,10 @@ endif () + #----------------------------------------------------------------------------- + configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) + ++#----------------------------------------------------------------------------- ++# Copy the pre-generated files in place ++#----------------------------------------------------------------------------- ++configure_file(H5Tinit.c H5Tinit.c COPYONLY) ++configure_file(H5lib_settings.c H5lib_settings.c COPYONLY) ++ + include (CMakeInstallation.cmake) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d343208..d11525b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -613,32 +613,9 @@ set (H5_PRIVATE_HEADERS + #----------------------------------------------------------------------------- + add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c) + TARGET_C_PROPERTIES (H5detect STATIC " " " ") +-if (MSVC OR MINGW) +- target_link_libraries (H5detect "ws2_32.lib") +-endif () +- +-set (CMD $<TARGET_FILE:H5detect>) +-add_custom_command ( +- OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c +- COMMAND ${CMD} +- ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c +- DEPENDS H5detect +-) + + add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) + TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ") +-if (MSVC OR MINGW) +- target_link_libraries (H5make_libsettings "ws2_32.lib") +-endif () +- +-set (CMD $<TARGET_FILE:H5make_libsettings>) +-add_custom_command ( +- OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c +- COMMAND ${CMD} +- ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c +- DEPENDS H5make_libsettings +- WORKING_DIRECTORY ${HDF5_BINARY_DIR} +-) + + if (GENERATE_ERROR_HEADERS) + find_package (Perl) +-- +2.7.4 + |