Update to 1.8.18

- Add patch to fix build with -Werror=implicit-function-declaration
8 years ago · 1a489ed4f8
parent e706252303
commit 1a489ed4f8
4 changed files with 77 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,3 +21,4 @@ hdf5-1.8.5.tar.bz2
 /hdf5_1.8.15-patch1+docs-5.debian.tar.xz
 /hdf5-1.8.17.tar.bz2
 /hdf5_1.8.16+docs-8.debian.tar.xz
+/hdf5-1.8.18.tar.bz2
--- a/hdf5-implicit.patch
+++ b/hdf5-implicit.patch
@ -0,0 +1,65 @@
+diff -up hdf5-1.8.18/src/H5Dio.c.implicit hdf5-1.8.18/src/H5Dio.c
+--- hdf5-1.8.18/src/H5Dio.c.implicit	2016-11-04 12:41:06.000000000 -0600
+++ hdf5-1.8.18/src/H5Dio.c	2016-12-05 11:55:01.904538855 -0700
+@@ -30,6 +30,7 @@
+ #include "H5Iprivate.h"		/* IDs			  		*/
+ #include "H5MMprivate.h"        /* Memory management                    */
+ #include "H5Sprivate.h"		/* Dataspace			  	*/
+#include "H5Tprivate.h"          /* Datatype functions          */
+ 
+ #ifdef H5_HAVE_PARALLEL
+ /* Remove this if H5R_DATASET_REGION is no longer used in this file */
+diff -up hdf5-1.8.18/src/H5Tprivate.h.implicit hdf5-1.8.18/src/H5Tprivate.h
+--- hdf5-1.8.18/src/H5Tprivate.h.implicit	2016-11-04 12:41:07.000000000 -0600
+++ hdf5-1.8.18/src/H5Tprivate.h	2016-12-05 12:09:32.505896332 -0700
+@@ -137,6 +137,7 @@ H5_DLL htri_t H5T_is_sensible(const H5T_
+ H5_DLL uint32_t H5T_hash(H5F_t * file, const H5T_t *dt);
+ H5_DLL herr_t H5T_set_latest_version(H5T_t *dt);
+ H5_DLL herr_t H5T_patch_file(H5T_t *dt, H5F_t *f);
+H5_DLL herr_t H5T_patch_vlen_file(H5T_t *dt, H5F_t *f);
+ H5_DLL htri_t H5T_is_variable_str(const H5T_t *dt);
+ 
+ /* Reference specific functions */
+diff -up hdf5-1.8.18/test/cache_common.h.implicit hdf5-1.8.18/test/cache_common.h
+--- hdf5-1.8.18/test/cache_common.h.implicit	2016-11-04 12:41:07.000000000 -0600
+++ hdf5-1.8.18/test/cache_common.h	2016-12-05 12:20:59.094165051 -0700
+@@ -684,6 +684,9 @@ void verify_unprotected(void);
+ 
+ /*** H5AC level utility functions ***/
+ 
+hbool_t resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
+    const H5C_auto_size_ctl_t *b, hbool_t compare_init);
+
+ void check_and_validate_cache_hit_rate(hid_t file_id,
+                                        double * hit_rate_ptr,
+                                        hbool_t dump_data,
+diff -up hdf5-1.8.18/testpar/t_span_tree.c.implicit hdf5-1.8.18/testpar/t_span_tree.c
+--- hdf5-1.8.18/testpar/t_span_tree.c.implicit	2016-11-04 12:41:07.000000000 -0600
+++ hdf5-1.8.18/testpar/t_span_tree.c	2016-12-05 13:08:06.505403191 -0700
+@@ -34,9 +34,15 @@
+ 
+  */
+ 
+#define H5S_PACKAGE             /*suppress error about including H5Spkg   */
+
+/* Define this macro to indicate that the testing APIs should be available */
+#define H5S_TESTING
+
+ #include "hdf5.h"
+ #include "H5private.h"
+ #include "testphdf5.h"
+#include "H5Spkg.h"
+ 
+ 
+ static void coll_write_test(int chunk_factor);
+diff -up hdf5-1.8.18/tools/perform/perf.c.implicit hdf5-1.8.18/tools/perform/perf.c
+--- hdf5-1.8.18/tools/perform/perf.c.implicit	2016-11-04 12:41:07.000000000 -0600
+++ hdf5-1.8.18/tools/perform/perf.c	2016-12-05 13:17:36.125394103 -0700
+@@ -24,6 +24,7 @@
+ 
+ #include "hdf5.h"
+ #include "H5private.h"
+#include "h5test.h"
+ 
+ #ifdef H5_HAVE_PARALLEL
+ 
--- a/hdf5.spec
+++ b/hdf5.spec
@ -6,20 +6,22 @@
 # NOTE:  Try not to release new versions to released versions of Fedora
 # You need to recompile all users of HDF5 for each version change
 Name: hdf5
-Version: 1.8.17
-Release: 2%{?dist}
+Version: 1.8.18
+Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/

-Source0: http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%{version}%{?snaprel}/src/hdf5-%{version}%{?snaprel}.tar.bz2
+Source0: https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-%{version}%{?snaprel}.tar.bz2
 Source1: h5comp
 # For man pages
 Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.16+docs-8.debian.tar.xz
 Patch0: hdf5-LD_LIBRARY_PATH.patch
 # Properly run MPI_Finalize() in t_pflush1
 Patch1: hdf5-mpi.patch
+# Fix compilation with -Werror=implicit-function-declaration
+Patch2: hdf5-implicit.patch
 # Fix long double conversions on ppc64le
 # https://bugzilla.redhat.com/show_bug.cgi?id=1078173
 Patch3: hdf5-ldouble-ppc64le.patch
@ -150,6 +152,7 @@ HDF5 parallel openmpi static libraries
 %setup -q -a 2 -n %{name}-%{version}%{?snaprel}
 %patch0 -p1 -b .LD_LIBRARY_PATH
 %patch1 -p1 -b .mpi
+%patch2 -p1 -b .implicit
 %patch3 -p1 -b .ldouble-ppc64le
 # Force shared by default for compiler wrappers (bug #1266645)
 sed -i -e '/^STATIC_AVAILABLE=/s/=.*/=no/' */*/h5[cf]*.in
@ -422,6 +425,10 @@ done


 %changelog
+* Mon Dec 5 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.18-1
+- Update to 1.8.18
+- Add patch to fix build with -Werror=implicit-function-declaration
+
 * Fri Oct 21 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.17-2
 - Rebuild for openmpi 2.0

--- a/2
+++ b/2
@ -1,2 +1,2 @@
-34bd1afa5209259201a41964100d6203  hdf5-1.8.17.tar.bz2
+29117bf488887f89888f9304c8ebea0b  hdf5-1.8.18.tar.bz2
 a66543c36a08e7fb488b91cecc61aedf  hdf5_1.8.16+docs-8.debian.tar.xz