debian/changelog

@@ -5,6 +5,11 @@ hdf5 (1.10.2+repack-1~exp2) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.1.5, no changes.
   * Strip trailing whitespace from changelog file.
 
+  [ Gilles Filippini ]
+  * Enable openmpi flavor for m68k and sh4 (closes: #897273)
+  * hdf5-tools: install h5clear (closes: #903041)
+  * New patch gcc-8.patch: fix FTBFS against gcc-8
+
  -- Gilles Filippini <pini@debian.org>  Tue, 03 Apr 2018 22:05:51 +0200
 
 hdf5 (1.10.2+repack-1~exp1) experimental; urgency=medium

debian/hdf5-tools.install

 usr/bin/gif2h5
 usr/bin/h52gif
+usr/bin/h5clear
 usr/bin/h5copy
 usr/bin/h5debug
 usr/bin/h5diff

debian/patches/gcc-8.patch

+Index: hdf5-1.10.2+repack/src/H5detect.c
+===================================================================
+--- hdf5-1.10.2+repack.orig/src/H5detect.c
++++ hdf5-1.10.2+repack/src/H5detect.c
+@@ -1361,7 +1361,7 @@ bit.\n";
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C89_integers(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C89_integers(void)
+ {
+     DETECT_BYTE(signed char,      SCHAR,        d_g[nd_g]); nd_g++;
+     DETECT_BYTE(unsigned char,      UCHAR,        d_g[nd_g]); nd_g++;
+@@ -1389,7 +1389,7 @@ detect_C89_integers(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C89_floats(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C89_floats(void)
+ {
+     DETECT_F(float,     FLOAT,      d_g[nd_g]); nd_g++;
+     DETECT_F(double,    DOUBLE,     d_g[nd_g]); nd_g++;
+@@ -1411,7 +1411,7 @@ detect_C89_floats(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C99_integers8(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C99_integers8(void)
+ {
+ #if H5_SIZEOF_INT8_T>0
+   #if H5_SIZEOF_INT8_T==1
+@@ -1473,7 +1473,7 @@ detect_C99_integers8(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C99_integers16(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C99_integers16(void)
+ {
+ #if H5_SIZEOF_INT16_T>0
+     DETECT_I(int16_t,           INT16,        d_g[nd_g]); nd_g++;
+@@ -1511,7 +1511,7 @@ detect_C99_integers16(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C99_integers32(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C99_integers32(void)
+ {
+ #if H5_SIZEOF_INT32_T>0
+     DETECT_I(int32_t,           INT32,        d_g[nd_g]); nd_g++;
+@@ -1549,7 +1549,7 @@ detect_C99_integers32(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C99_integers64(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C99_integers64(void)
+ {
+ #if H5_SIZEOF_INT64_T>0
+     DETECT_I(int64_t,           INT64,        d_g[nd_g]); nd_g++;
+@@ -1600,7 +1600,7 @@ detect_C99_integers64(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C99_integers(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C99_integers(void)
+ {
+     /* break it down to more subroutines so that each module subroutine */
+     /* is smaller and takes less time to compile with optimization on.  */
+@@ -1626,7 +1626,7 @@ detect_C99_integers(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_C99_floats(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_C99_floats(void)
+ {
+ #if H5_SIZEOF_DOUBLE == H5_SIZEOF_LONG_DOUBLE
+     /*
+@@ -1657,7 +1657,7 @@ detect_C99_floats(void) HDF_NO_UBSAN
+  *-------------------------------------------------------------------------
+  */
+ static void
+-detect_alignments(void) HDF_NO_UBSAN
++HDF_NO_UBSAN detect_alignments(void)
+ {
+     /* Detect structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
+     DETECT_M(void *,              POINTER,      m_g[na_g]); na_g++;
+@@ -1745,7 +1745,7 @@ static int verify_signal_handlers(int si
+  *-------------------------------------------------------------------------
+  */
+ int
+-main(void) HDF_NO_UBSAN
++HDF_NO_UBSAN main(void)
+ {
+ 
+ #if defined(H5_HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)

debian/patches/series

@@ -4,3 +4,4 @@ ullong_force.diff
 relax-version-check.patch
 java-runtime-exception.patch
 fix-unaligned-accesses.patch
+gcc-8.patch

debian/rules

@@ -60,8 +60,7 @@ DEFAULT_MPI=$(ARCH_DEFAULT_MPI_IMPL)
 # Setting empty OMPIARCHS and MPICHARCHS environment variables disables
 # the related mpi targets
 #
-# openmpi broken on archs m68k sh4 (2016-12-04)
-OMPIARCHS?=any !m68k !sh4
+OMPIARCHS?=any
 MPICHARCHS?=any
 
 # BEGIN - Construct the FLAVORS list for current arch