Accepting request 178962 from devel:libraries:c_c++

- increase hdf5_libver to 8 (forwarded request 178934 from rudi_m)

OBS-URL: https://build.opensuse.org/request/show/178962
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=13

baselibs.conf

@@ -1,18 +1,18 @@
-libhdf5-0
+libhdf5-8
 hdf5-devel
   requires -<targettype>
-  requires "libhdf5-0-<targettype> = <version>"
+  requires "libhdf5-8-<targettype> = <version>"
-  requires "libhdf5_hl0-<targettype> = <version>"
+  requires "libhdf5_hl8-<targettype> = <version>"
-libhdf5-0-openmpi
+libhdf5-8-openmpi
 hdf5-openmpi-devel
   requires -openmpi-<targettype>
-  requires "libhdf5-0-openmpi-<targettype> = <version>"
+  requires "libhdf5-8-openmpi-<targettype> = <version>"
-  requires "libhdf5_hl0-openmpi-<targettype> = <version>"
+  requires "libhdf5_hl8-openmpi-<targettype> = <version>"
-libhdf5-0-mvapich2
+libhdf5-8-mvapich2
-libhdf5_hl0
+libhdf5_hl8
-libhdf5_hl0-mvapich2
+libhdf5_hl8-mvapich2
-libhdf5_hl0-openmpi
+libhdf5_hl8-openmpi
 hdf5-mvapich2-devel
   requires -openmpi-<targettype>
-  requires "libhdf5-0-mvapich2-<targettype> = <version>"
+  requires "libhdf5-8-mvapich2-<targettype> = <version>"
-  requires "libhdf5_hl0-mvapich2-<targettype> = <version>"
+  requires "libhdf5_hl8-mvapich2-<targettype> = <version>"

hdf5-1.8.10-patch1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:292afb3615ad9e68f4d5d18ebb11e4a73f2aece39f2da3875a457ff1e109fc41
-size 6010792

hdf5-1.8.11-abort_unknown_host_config.patch

@@ -0,0 +1,22 @@
+--- configure.ac.orig       2013-05-08 08:34:56.000000000 +0200
++++ configure.ac    2013-06-12 11:57:59.161401364 +0200
+@@ -302,6 +302,8 @@ done
+ if test "X$host_config" != "Xnone"; then
+   CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
+   . $host_config
++else
++  AC_MSG_ERROR([no usable host config found])
+ fi
+
+ ## Source any special site-specific file
+--- configure,orig	2013-05-08 08:35:37.000000000 +0200
++++ configure	2013-06-12 11:58:57.991149444 +0200
+@@ -4126,6 +4126,8 @@ done
+ if test "X$host_config" != "Xnone"; then
+   CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
+   . $host_config
++else
++  as_fn_error $? "no usable host config found" "$LINENO" 5
+ fi
+ 
+ ## Source any special site-specific file

hdf5-1.8.11.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ea1ba82fc77350ee628b795ae6ede05feeaf1c6b437911a9478de456600cafb
+size 5928553

hdf5-fix_printf.patch

@@ -1,11 +0,0 @@
---- test/testhdf5.h.orig	2012-10-11 19:30:43.000000000 +0200
-+++ test/testhdf5.h	2012-11-19 12:34:25.021980147 +0100
-@@ -142,7 +142,7 @@
-     if(VERBOSE_HI)					                      \
- 	print_func("   Call to routine: %15s at line %4d in %s returned "     \
-            "invalid result\n", where, (int)__LINE__, __FILE__);               \
--    TestErrPrintf("*** UNEXPECTED RESULT from %s at line %4d in %s\n"         \
-+    TestErrPrintf("*** UNEXPECTED RESULT from %s at line %4d in %s\n",        \
-                where, (int)__LINE__, __FILE__);                               \
- } while(0)
- 

hdf5-non_void_return.patch

@@ -10,53 +10,3 @@ Index: test/dt_arith.c
  }
  
  
-Index: tools/h5diff/h5diff_common.c
-===================================================================
---- tools/h5diff/h5diff_common.c.orig	2011-11-07 23:11:35.000000000 +0100
-+++ tools/h5diff/h5diff_common.c	2011-11-27 14:23:49.105943847 +0100
-@@ -69,6 +69,7 @@ static check_options(diff_opt_t* options
-         printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 Reference Manual'.\n", PROGRAMNAME);
-         h5diff_exit(EXIT_FAILURE);
-     }
-+    return (0); // no return in non void function fix
- }
- 
- 
---- test/filter_fail.c.orig	2012-05-09 17:05:49.000000000 +0200
-+++ test/filter_fail.c	2012-06-22 09:03:42.885161176 +0200
-@@ -408,4 +408,5 @@ error:
-                nerrors, 1==nerrors?"":"S");
-         HDexit(1);
-     }
-+    return 1; // no return in non void function fix
- }
---- ./tools/h5dump/h5dump.c.orig	2012-06-22 09:08:06.118448407 +0200
-+++ ./tools/h5dump/h5dump.c	2012-06-22 09:07:36.352205461 +0200
-@@ -1658,6 +1658,7 @@ done:
-     H5Eset_auto2(H5E_DEFAULT, func, edata);
- 
-     leave(h5tools_getstatus());
-+    return 1; // no return in non void function fix
- }
- 
- /*-------------------------------------------------------------------------
---- ./tools/h5ls/h5ls.c.orig	2012-05-09 17:06:15.000000000 +0200
-+++ ./tools/h5ls/h5ls.c	2012-06-22 09:09:50.224802879 +0200
-@@ -2872,5 +2872,7 @@ main(int argc, const char *argv[])
-         leave(EXIT_FAILURE);
-     else
-         leave(EXIT_SUCCESS);
-+
-+    return 1; // no return in non void function fix
- } /* end main() */
- 
---- ./tools/h5stat/h5stat.c.orig	2012-05-09 17:06:15.000000000 +0200
-+++ ./tools/h5stat/h5stat.c	2012-06-22 09:11:07.678837985 +0200
-@@ -1546,5 +1546,7 @@ done:
-     }
- 
-     leave(h5tools_getstatus());
-+
-+    return 1; // no return in non void function fix
- }
- 

hdf5.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Jun 14 00:09:30 UTC 2013 - sweet_f_a@gmx.de
+
+- increase hdf5_libver to 8
+
+-------------------------------------------------------------------
+Wed Jun 12 11:22:35 UTC 2013 - sweet_f_a@gmx.de
+
+- use host config "linux-gnu" for arm (linux-gnueabi) to get useful
+  H5_CFLAGS too
+- add hdf5-1.8.11-abort_unknown_host_config.patch, to get noticed
+  if hdf5 doesn' t know our host
+- minimize hdf5-non_void_return.patch, false positives doesn't make
+  problems anymore since now we have always -Wmissing-noreturn
+- make verbose
+- gcc 4.6.x needs -O0 on some systems
+
+-------------------------------------------------------------------
+Tue Jun 11 13:45:26 UTC 2013 - sweet_f_a@gmx.de
+
+- Update to 1.8.11, changes documented here:
+  http://www.hdfgroup.org/HDF5/doc/ADGuide/Changes.html
+- remove hdf5-fix_printf.patch, fixed by upstream 
+- use default CFLAGS (-O2) again if possible
+
 -------------------------------------------------------------------
 Fri Apr 12 19:25:06 UTC 2013 - sweet_f_a@gmx.de
 

hdf5.spec

@@ -16,7 +16,7 @@
 #
 
 
-%define hdf5_libver 0
+%define hdf5_libver 8
 %define libname libhdf5
 
 %if 0%{?sles_version}
@@ -29,10 +29,10 @@
 %define _mpi %{?_openmpi:openmpi} %{?_mvapich2:mvapich2}
 
 # rpm may not like this original version number
-%define xversion 1.8.10-patch1
+%define xversion 1.8.11
 
 Name:           hdf5
-Version:        1.8.10.patch1
+Version:        1.8.11
 Release:        0
 Summary:        A general purpose library and file format for storing scientific data
 License:        BSD-3-Clause
@@ -41,8 +41,8 @@ Url:            http://www.hdfgroup.org/HDF5/
 Source0:        http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-%{xversion}/src/hdf5-%{xversion}.tar.bz2
 Patch0:         hdf5-LD_LIBRARY_PATH.patch
 Patch1:         hdf5-non_void_return.patch
-# fix broken printf call, sent upstream
+# not really needed but we want to get noticed if hdf5 doesn' t know our host
-Patch2:         hdf5-fix_printf.patch
+Patch2:         hdf5-1.8.11-abort_unknown_host_config.patch
 %ifarch %arm
 Patch4:         hdf5-1.8.10-tests-arm.patch
 %endif
@@ -277,9 +277,12 @@ This package provides the static libraries.
 
 %prep
 %setup -q -n %{name}-%{xversion}
+# don't forget to increase hdf5_libver, see also baselibs.conf
+LT_VERS_INTERFACE=$(sed -n 's/^ *LT_VERS_INTERFACE *= *//p' config/lt_vers.am)
+test "%{hdf5_libver}" = "${LT_VERS_INTERFACE}" || exit 1
 %patch0 -p1 -b .LD_LIBRARY_PATH
 %patch1 -p0 -b .non_void_return
-%patch2 -p0 -b .fix_printf
+%patch2 -p0 -b .abort_unknown_host_config
 %ifarch %arm
 %patch4 -p0 -b .tests-arm
 %endif
@@ -294,8 +297,14 @@ done
 export CC=gcc
 export CXX=g++
 export F9X=gfortran
-export CFLAGS="${RPM_OPT_FLAGS/-O2/-O0}"
+# workaround for known gcc issue, see RELEASE.txt
-# export CFLAGS="%%{optflags} -fno-strict-aliasing"
+if gcc --version |grep -q " 4\.6"; then
+	export CFLAGS="${RPM_OPT_FLAGS/-O2/-O0}"
+fi
+%ifarch %arm
+# we want to have useful H5_CFLAGS on arm too
+test -e config/linux-gnueabi || cp config/linux-gnu config/linux-gnueabi
+%endif
 
 pushd build
 %configure \
@@ -309,7 +318,7 @@ pushd build
   --enable-cxx \
   --with-pthread
 
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 popd
 
 for mpi in %_mpi;