diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-12-11 23:46:33 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-12-13 18:29:14 -0800 |
| commit | 7906fbb404b7a3138f43f32781de36872c18a71c (patch) | |
| tree | 4ce69d494fb209a6b4e03345e1298966e1f53679 /meta-oe/recipes-support/hdf5 | |
| parent | 9625a375eea655d02cb3d45ff98d56c821dda297 (diff) | |
| download | meta-openembedded-7906fbb404b7a3138f43f32781de36872c18a71c.tar.gz | |
hdf5: Upgrade to 1.8.21
Forward port 0001-cross-compiling-support.patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/hdf5')
| -rw-r--r-- | meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch | 23 | ||||
| -rw-r--r-- | meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb (renamed from meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb) | 5 |
2 files changed, 12 insertions, 16 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 index 97f16bbc0b..bdc1fa5f96 100644 --- a/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch +++ b/meta-oe/recipes-support/hdf5/files/0001-cross-compiling-support.patch @@ -14,11 +14,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 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 () +@@ -770,4 +770,10 @@ endif () #----------------------------------------------------------------------------- configure_file (${HDF_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubconf.h @ONLY) @@ -29,22 +27,22 @@ index 08a65c4..9af14d5 100644 +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 +@@ -613,36 +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 () +-if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") +- set_property(TARGET H5detect PROPERTY LINK_FLAGS "-O0") +-endif () - --set (CMD $<TARGET_FILE:H5detect>) -add_custom_command ( - OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c -- COMMAND ${CMD} +- COMMAND $<TARGET_FILE:H5detect> - ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c - DEPENDS H5detect -) @@ -54,11 +52,13 @@ index d343208..d11525b 100644 -if (MSVC OR MINGW) - target_link_libraries (H5make_libsettings "ws2_32.lib") -endif () +-if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten") +- set_property(TARGET H5make_libsettings PROPERTY LINK_FLAGS "-O0") +-endif () - --set (CMD $<TARGET_FILE:H5make_libsettings>) -add_custom_command ( - OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c -- COMMAND ${CMD} +- COMMAND $<TARGET_FILE:H5make_libsettings> - ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c - DEPENDS H5make_libsettings - WORKING_DIRECTORY ${HDF5_BINARY_DIR} @@ -66,6 +66,3 @@ index d343208..d11525b 100644 if (GENERATE_ERROR_HEADERS) find_package (Perl) --- -2.7.4 - diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb index fcbe9b0d62..9af2b67149 100644 --- a/meta-oe/recipes-support/hdf5/hdf5_1.8.19.bb +++ b/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb @@ -16,9 +16,8 @@ SRC_URI = " \ file://0001-cross-compiling-support.patch \ file://0002-Remove-suffix-shared-from-shared-library-name.patch \ " - -SRC_URI[md5sum] = "6f0353ee33e99089c110a1c8d2dd1b22" -SRC_URI[sha256sum] = "59c03816105d57990329537ad1049ba22c2b8afe1890085f0c022b75f1727238" +SRC_URI[md5sum] = "2d2408f2a9dfb5c7b79998002e9a90e9" +SRC_URI[sha256sum] = "e5b1b1dee44a64b795a91c3321ab7196d9e0871fe50d42969761794e3899f40d" FILES_${PN} += "${libdir}/libhdf5.settings ${datadir}/*" |