libhdf5: update to 1.10.5
This commit is contained in:
Henrik Grimler
parent
be0806e36e
commit
7af23331fe
@ -1,40 +1,88 @@
|
||||
--- ../CMakeLists.txt.orig 2019-01-26 00:17:38.419818085 +0000
|
||||
+++ ./src/CMakeLists.txt 2019-01-26 00:25:12.349814559 +0000
|
||||
@@ -874,13 +874,6 @@
|
||||
INTERFACE $<$<PLATFORM_ID:Emscripten>:"-O0">
|
||||
)
|
||||
|
||||
- add_custom_command (
|
||||
- OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c
|
||||
- COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}$<TARGET_FILE:H5detect>
|
||||
- ARGS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c
|
||||
- DEPENDS H5detect
|
||||
- WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR}
|
||||
- )
|
||||
if (BUILD_SHARED_LIBS)
|
||||
if (NOT EXISTS ${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c)
|
||||
add_custom_command (
|
||||
@@ -916,23 +909,6 @@
|
||||
INTERFACE $<$<PLATFORM_ID:Emscripten>:"-O0">
|
||||
--- ../src-CMakeLists.txt.orig 2019-04-20 13:25:04.657215279 +0000
|
||||
+++ ./src/CMakeLists.txt 2019-04-20 16:22:38.564254099 +0000
|
||||
@@ -943,56 +943,14 @@
|
||||
${HDF5_SOURCE_DIR}/bin/batch/${HDF5_BATCH_H5DETECT_SCRIPT}.in.cmake
|
||||
${HDF5_BINARY_DIR}/${HDF5_BATCH_H5DETECT_SCRIPT} ESCAPE_QUOTES @ONLY
|
||||
)
|
||||
- add_custom_command (
|
||||
- OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c
|
||||
- ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp1
|
||||
- COMMAND ${HDF5_BATCH_CMD}
|
||||
- ARGS ${HDF5_BINARY_DIR}/${HDF5_BATCH_H5DETECT_SCRIPT}
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E echo "Executed batch command to create H5Tinit.c"
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E touch ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp1
|
||||
- DEPENDS H5detect
|
||||
- WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR}
|
||||
- )
|
||||
add_custom_target (gen_H5Tinit
|
||||
COMMAND ${CMAKE_COMMAND} -P ${HDF5_SOURCE_DIR}/config/cmake/wait_H5Tinit.cmake
|
||||
)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
- add_custom_command (
|
||||
- OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c
|
||||
- ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E copy_if_different "${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c" "${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c"
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E touch ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1
|
||||
- DEPENDS gen_H5Tinit ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit_created
|
||||
- WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR}
|
||||
- )
|
||||
set_source_files_properties (${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c PROPERTIES GENERATED TRUE)
|
||||
endif ()
|
||||
else ()
|
||||
- add_custom_command (
|
||||
- OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c
|
||||
- ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp1
|
||||
- COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}$<TARGET_FILE:H5detect>
|
||||
- ARGS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E touch ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp1
|
||||
- DEPENDS H5detect
|
||||
- WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR}
|
||||
- )
|
||||
if (BUILD_SHARED_LIBS)
|
||||
- add_custom_command (
|
||||
- OUTPUT ${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c
|
||||
- ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E copy_if_different "${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c" "${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c"
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E touch ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp1
|
||||
- DEPENDS ${HDF5_GENERATED_SOURCE_DIR}/H5Tinit.c
|
||||
- WORKING_DIRECTORY ${HDF5_GENERATED_SOURCE_DIR}
|
||||
- )
|
||||
set_source_files_properties (${HDF5_GENERATED_SOURCE_DIR}/shared/H5Tinit.c PROPERTIES GENERATED TRUE)
|
||||
endif ()
|
||||
endif ()
|
||||
@@ -1028,28 +986,8 @@
|
||||
PRIVATE $<$<PLATFORM_ID:Emscripten>:"-O0">
|
||||
)
|
||||
|
||||
-add_custom_command (
|
||||
- OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
- ${HDF5_BINARY_DIR}/gen_SRCS.stamp2
|
||||
- COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}$<TARGET_FILE:H5make_libsettings>
|
||||
- ARGS ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E touch ${HDF5_GENERATED_SOURCE_DIR}/gen_SRCS.stamp2
|
||||
- DEPENDS H5make_libsettings
|
||||
- WORKING_DIRECTORY ${HDF5_BINARY_DIR}
|
||||
-)
|
||||
-if (BUILD_SHARED_LIBS)
|
||||
set_source_files_properties (${HDF5_BINARY_DIR}/H5lib_settings.c PROPERTIES GENERATED TRUE)
|
||||
if (BUILD_SHARED_LIBS)
|
||||
- add_custom_command (
|
||||
- OUTPUT ${HDF5_BINARY_DIR}/shared/H5lib_settings.c
|
||||
- COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR}$<TARGET_FILE:H5make_libsettings>
|
||||
- ARGS ${HDF5_BINARY_DIR}/shared/H5lib_settings.c
|
||||
- DEPENDS H5make_libsettings
|
||||
- ${HDF5_BINARY_DIR}/shared/shared_gen_SRCS.stamp2
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E copy_if_different "${HDF5_BINARY_DIR}/H5lib_settings.c" "${HDF5_BINARY_DIR}/shared/H5lib_settings.c"
|
||||
- COMMAND ${CMAKE_COMMAND}
|
||||
- ARGS -E touch ${HDF5_GENERATED_SOURCE_DIR}/shared/shared_gen_SRCS.stamp2
|
||||
- DEPENDS ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
- WORKING_DIRECTORY ${HDF5_BINARY_DIR}
|
||||
- )
|
||||
-endif ()
|
||||
-
|
||||
## all_packages="AC,B,B2,D,F,FA,FL,FS,HL,I,O,S,ST,T,Z"
|
||||
#all_packages="AC,B2,CX,D,F,HL,I,O,S,ST,T,Z"
|
||||
option (HDF5_ENABLE_DEBUG_APIS "Turn on extra debug output in all packages" OFF)
|
||||
set_source_files_properties (${HDF5_BINARY_DIR}/shared/H5lib_settings.c PROPERTIES GENERATED TRUE)
|
||||
endif ()
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
TERMUX_PKG_HOMEPAGE=https://portal.hdfgroup.org/display/support
|
||||
TERMUX_PKG_DESCRIPTION="Hierarchical Data Format 5 (HDF5)"
|
||||
TERMUX_PKG_LICENSE="BSD 3-Clause"
|
||||
TERMUX_PKG_VERSION=1.10.4
|
||||
TERMUX_PKG_SHA256=1267ff06aaedc04ca25f7c6026687ea2884b837043431195f153401d942b28df
|
||||
TERMUX_PKG_VERSION=1.10.5
|
||||
TERMUX_PKG_SHA256=68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44
|
||||
TERMUX_PKG_SRCURL=https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${TERMUX_PKG_VERSION:0:4}/hdf5-$TERMUX_PKG_VERSION/src/hdf5-$TERMUX_PKG_VERSION.tar.bz2
|
||||
TERMUX_PKG_DEPENDS="libzopfli"
|
||||
TERMUX_PKG_FORCE_CMAKE=true
|
||||
@ -12,6 +12,8 @@ termux_step_pre_configure () {
|
||||
cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/
|
||||
mkdir -p $TERMUX_PKG_BUILDDIR/shared/
|
||||
cp $TERMUX_PKG_BUILDER_DIR/$TERMUX_ARCH/{H5Tinit.c,H5lib_settings.c} $TERMUX_PKG_BUILDDIR/shared/
|
||||
touch $TERMUX_PKG_BUILDDIR/gen_SRCS.stamp1 $TERMUX_PKG_BUILDDIR/gen_SRCS.stamp2
|
||||
touch $TERMUX_PKG_BUILDDIR/shared/shared_gen_SRCS.stamp1 $TERMUX_PKG_BUILDDIR/shared/shared_gen_SRCS.stamp2
|
||||
}
|
||||
|
||||
termux_step_post_configure () {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user