Commit a999667c authored by brinn's avatar brinn

Update HDF5 library to 1.10.4.

parent f08298ca
diff -ruN CMake-hdf5-1.10.3.orig/hdf5-1.10.3/java/src/jni/CMakeLists.txt CMake-hdf5-1.10.3/hdf5-1.10.3/java/src/jni/CMakeLists.txt
--- CMake-hdf5-1.10.3.orig/hdf5-1.10.3/java/src/jni/CMakeLists.txt 2018-07-29 14:25:43.000000000 +0200
+++ CMake-hdf5-1.10.3/hdf5-1.10.3/java/src/jni/CMakeLists.txt 2018-08-23 12:22:09.608458730 +0200
diff -ruN CMake-hdf5-1.10.4.orig/hdf5-1.10.4/java/src/jni/CMakeLists.txt CMake-hdf5-1.10.4/hdf5-1.10.4/java/src/jni/CMakeLists.txt
--- CMake-hdf5-1.10.4.orig/hdf5-1.10.4/java/src/jni/CMakeLists.txt 2018-07-29 14:25:43.000000000 +0200
+++ CMake-hdf5-1.10.4/hdf5-1.10.4/java/src/jni/CMakeLists.txt 2018-08-23 12:22:09.608458730 +0200
@@ -21,6 +21,10 @@
${HDF5_JAVA_JNI_SOURCE_DIR}/h5util.c
${HDF5_JAVA_JNI_SOURCE_DIR}/h5zImp.c
......
diff -ruN CMake-hdf5-1.10.3.orig/HDF5options.cmake CMake-hdf5-1.10.3/HDF5options.cmake
--- CMake-hdf5-1.10.3.orig/HDF5options.cmake 2018-08-21 08:17:50.000000000 +0200
+++ CMake-hdf5-1.10.3/HDF5options.cmake 2018-08-23 12:14:22.128057145 +0200
diff -ruN CMake-hdf5-1.10.4.orig/HDF5options.cmake CMake-hdf5-1.10.4/HDF5options.cmake
--- CMake-hdf5-1.10.4.orig/HDF5options.cmake 2018-08-21 08:17:50.000000000 +0200
+++ CMake-hdf5-1.10.4/HDF5options.cmake 2018-08-23 12:14:22.128057145 +0200
@@ -38,9 +38,9 @@
#############################################################################################
......
......@@ -41,4 +41,4 @@ fi
make -j $NCPU &> build.log
make install &> install.log
#make test &> test.log
make test &> test.log
#! /bin/bash
CFLAGS='-fPIC -m64' ./compile_hdf5_gcc.sh amd64 "hdf5-1.10.3-jhdf5-h5dImp.patch"
CFLAGS='-fPIC -m64' ./compile_hdf5_gcc.sh amd64 "hdf5-1.10.4-jhdf5-h5dImp.patch"
#! /bin/bash
./compile_hdf5_gcc.sh armv6l "hdf5-1.10.3-jhdf5-h5dImp.patch"
./compile_hdf5_gcc.sh armv6l "hdf5-1.10.4-jhdf5-h5dImp.patch"
#! /bin/bash
CFLAGS='-m64 -mmacosx-version-min=10.11' ./compile_hdf5_gcc.sh x86_64 "hdf5-1.10.3-jhdf5-h5dImp.patch"
CFLAGS='-m64 -mmacosx-version-min=10.11' ./compile_hdf5_gcc.sh x86_64 "hdf5-1.10.4-jhdf5-h5dImp.patch"
diff -ru hdf5-1.10.3/java/src/jni/h5dImp.c hdf5-1.10.3.patched/java/src/jni/h5dImp.c
--- hdf5-1.10.3/java/src/jni/h5dImp.c 2018-08-09 18:19:06.000000000 +0200
+++ hdf5-1.10.3.patched/java/src/jni/h5dImp.c 2018-08-13 15:49:12.894709592 +0200
@@ -295,21 +295,7 @@
diff -ruN hdf5-1.10.4.sv/java/src/jni/h5dImp.c hdf5-1.10.4/java/src/jni/h5dImp.c
--- hdf5-1.10.4.sv/java/src/jni/h5dImp.c 2018-09-10 16:43:41.000000000 +0200
+++ hdf5-1.10.4/java/src/jni/h5dImp.c 2018-10-20 22:55:44.073210246 +0200
@@ -299,21 +299,7 @@
if (buf == NULL) {
h5nullArgument(env, "H5Dread: buf is NULL");
} /* end if */
......@@ -23,7 +23,7 @@ diff -ru hdf5-1.10.3/java/src/jni/h5dImp.c hdf5-1.10.3.patched/java/src/jni/h5dI
PIN_BYTE_ARRAY();
if (buffP == NULL) {
@@ -327,7 +313,6 @@
@@ -331,7 +317,6 @@
UNPIN_BYTE_ARRAY(0); /* update java buffer for return */
} /* end else */
} /* end else */
......@@ -31,7 +31,7 @@ diff -ru hdf5-1.10.3/java/src/jni/h5dImp.c hdf5-1.10.3.patched/java/src/jni/h5dI
} /* end else */
return (jint)status;
@@ -351,21 +336,7 @@
@@ -355,21 +340,7 @@
if (buf == NULL) {
h5nullArgument(env, "H5Dwrite: buf is NULL");
} /* end if */
......@@ -53,7 +53,7 @@ diff -ru hdf5-1.10.3/java/src/jni/h5dImp.c hdf5-1.10.3.patched/java/src/jni/h5dI
PIN_BYTE_ARRAY();
if (buffP == NULL) {
h5JNIFatalError(env, "H5Dwrite: buf not pinned");
@@ -379,7 +350,6 @@
@@ -383,7 +354,6 @@
if (status < 0)
h5libraryError(env);
} /* end else */
......
......@@ -18,5 +18,8 @@ rm -fR CMake-hdf5-$VERSION/hdf5-$VERSION/java/src/jni
cp -af ../jni CMake-hdf5-$VERSION/hdf5-$VERSION/java/src/
cp -af ../*.c CMake-hdf5-$VERSION/hdf5-$VERSION/java/src/jni/
patch -p0 < ../cmake_set_hdf5_options.diff
patch -p0 < ../cmake_add_sources.diff
cd CMake-hdf5-$VERSION
patch -p1 < ../../cmake_set_hdf5_options.diff
cd hdf5-$VERSION
patch -p2 < ../../../cmake_add_sources.diff
VERSION=1.10.3
VERSION=1.10.4
POSTFIX=
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment