diff --git a/Disable-phdf5-tests.patch b/Disable-phdf5-tests.patch new file mode 100644 index 0000000..c9ebfed --- /dev/null +++ b/Disable-phdf5-tests.patch @@ -0,0 +1,52 @@ +From: Egbert Eich +Date: Tue Nov 7 16:06:07 2017 +0100 +Subject: [PATCH]- Disable phdf5 tests. +Git-commit: 8b3e39a25d72b9dad5a5b13fb313226abf294069 +References: +Signed-off-by: Egbert Eich + +--- + testpar/CMakeTests.cmake | 2 +- + testpar/Makefile.am | 2 +- + testpar/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake +index 6e2b05e..75a65ab 100644 +--- a/testpar/CMakeTests.cmake ++++ b/testpar/CMakeTests.cmake +@@ -16,7 +16,7 @@ + ############################################################################## + ############################################################################## + +-add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $) ++## add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $) + + foreach (testp ${H5P_TESTS}) + add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $) +diff --git a/testpar/Makefile.am b/testpar/Makefile.am +index b87c1df..27af0df 100644 +--- a/testpar/Makefile.am ++++ b/testpar/Makefile.am +@@ -23,7 +23,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test + + # Test programs. These are our main targets. + # +-TEST_PROG_PARA=t_mpi testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame ++TEST_PROG_PARA=t_mpi t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame + + check_PROGRAMS = $(TEST_PROG_PARA) + +diff --git a/testpar/Makefile.in b/testpar/Makefile.in +index ed26624..2f4bbe2 100644 +--- a/testpar/Makefile.in ++++ b/testpar/Makefile.in +@@ -778,7 +778,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 MPItest.h5 \ + + # Test programs. These are our main targets. + # +-TEST_PROG_PARA = t_mpi testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame ++TEST_PROG_PARA = t_mpi t_cache t_cache_image t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame + testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \ + t_ph5basic.c t_coll_chunk.c t_span_tree.c t_chunk_alloc.c t_filter_read.c \ + t_prop.c diff --git a/Fix-warnings-for-missing-returns.patch b/Fix-warnings-for-missing-returns.patch new file mode 100644 index 0000000..847baea --- /dev/null +++ b/Fix-warnings-for-missing-returns.patch @@ -0,0 +1,118 @@ +From: Egbert Eich +Date: Tue Nov 7 12:56:49 2017 +0100 +Subject: [PATCH]Fix warnings for missing returns +Git-commit: 3204e3b0f578906edd85bb95b0bbc9818490e2d0 +References: +Signed-off-by: Egbert Eich + +Signed-off-by: Egbert Eich +--- + c++/src/H5Location.cpp | 1 + + test/dt_arith.c | 1 + + test/filter_fail.c | 1 + + tools/src/h5copy/h5copy.c | 2 +- + tools/src/h5dump/h5dump.c | 2 +- + tools/src/h5ls/h5ls.c | 2 +- + tools/src/h5stat/h5stat.c | 2 +- + tools/src/misc/h5mkgrp.c | 2 +- + 8 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp +index b2fa75d..a3fe206 100644 +--- a/c++/src/H5Location.cpp ++++ b/c++/src/H5Location.cpp +@@ -95,6 +95,7 @@ bool H5Location::exists(const char* name, const LinkAccPropList& lapl) const + { + throwException("exists", "H5Lexists failed"); + } ++ return false; + } + + //-------------------------------------------------------------------------- +diff --git a/test/dt_arith.c b/test/dt_arith.c +index c7f2986..8f3e6e4 100644 +--- a/test/dt_arith.c ++++ b/test/dt_arith.c +@@ -3384,6 +3384,7 @@ error: + else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL) + return 1; + #endif ++ return 1; + } + + +diff --git a/test/filter_fail.c b/test/filter_fail.c +index 76b3106..cda9d50 100644 +--- a/test/filter_fail.c ++++ b/test/filter_fail.c +@@ -406,4 +406,5 @@ error: + nerrors, 1==nerrors?"":"S"); + HDexit(EXIT_FAILURE); + } ++ return 1; + } +diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c +index 390b93e..506c24e 100644 +--- a/tools/src/h5copy/h5copy.c ++++ b/tools/src/h5copy/h5copy.c +@@ -55,7 +55,7 @@ char *str_flag = NULL; + * + *------------------------------------------------------------------------- + */ +-static void ++static void __attribute__((__noreturn__)) + leave(int ret) + { + if (fname_src) +diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c +index b53c212..747147b 100644 +--- a/tools/src/h5dump/h5dump.c ++++ b/tools/src/h5dump/h5dump.c +@@ -208,7 +208,7 @@ static struct long_options l_opts[] = { + * + *------------------------------------------------------------------------- + */ +-static void ++static void __attribute__((__noreturn__)) + leave(int ret) + { + h5tools_close(); +diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c +index 8e28d82..c1f1cba 100644 +--- a/tools/src/h5ls/h5ls.c ++++ b/tools/src/h5ls/h5ls.c +@@ -2564,7 +2564,7 @@ out: + * + *------------------------------------------------------------------------- + */ +-static void ++static void __attribute__((__noreturn__)) + leave(int ret) + { + h5tools_close(); +diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c +index 6aee7a8..b14a975 100644 +--- a/tools/src/h5stat/h5stat.c ++++ b/tools/src/h5stat/h5stat.c +@@ -250,7 +250,7 @@ static struct long_options l_opts[] = { + { NULL, 0, '\0' } + }; + +-static void ++static void __attribute__((__noreturn__)) + leave(int ret) + { + h5tools_close(); +diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c +index 597b6b3..15caff6 100644 +--- a/tools/src/misc/h5mkgrp.c ++++ b/tools/src/misc/h5mkgrp.c +@@ -58,7 +58,7 @@ param_t params; /* Command line parameter settings */ + * + *------------------------------------------------------------------------- + */ +-static void ++static void __attribute__((__noreturn__)) + leave(int ret) + { + size_t curr_group; diff --git a/PPC64LE-Fix-long-double-handling.patch b/PPC64LE-Fix-long-double-handling.patch new file mode 100644 index 0000000..41c5274 --- /dev/null +++ b/PPC64LE-Fix-long-double-handling.patch @@ -0,0 +1,91 @@ +From: Egbert Eich +Date: Tue Nov 7 14:16:53 2017 +0100 +Subject: [PATCH]PPC64LE: Fix long double handling +Git-commit: ad6559a71b7ba3cacb4b56d4747db63f28a12f55 +References: +Signed-off-by: Egbert Eich + +Signed-off-by: Egbert Eich +--- + hdf5-1.10.1/config/cmake/ConversionTests.c | 16 ++++++++++++++++ + hdf5-1.10.1/test/dt_arith.c | 26 ++++++++++++++++++++++++-- + 2 files changed, 40 insertions(+), 2 deletions(-) + +diff --git a/hdf5-1.10.1/config/cmake/ConversionTests.c b/hdf5-1.10.1/config/cmake/ConversionTests.c +index 082dbd4..9618a14 100644 +--- a/config/cmake/ConversionTests.c ++++ b/config/cmake/ConversionTests.c +@@ -23,6 +23,14 @@ int main(void) + unsigned char s2[8]; + int ret = 1; + ++#if defined __powerpc64__ && defined _LITTLE_ENDIAN ++ /* Don't bother checking on ppc64le, we know it'll work, and ++ that what hdf5 calls 'special algorithm' simply is ++ IBM ldouble 128 (i.e. two seperately scaled doubles). ++ The check below assumes big endian. */ ++ ret = 0; ++#endif ++ + if(sizeof(long double) == 16 && sizeof(long) == 8) { + /*make sure the long double type has 16 bytes in size and + * 11 bits of exponent. If it is, +@@ -146,6 +154,14 @@ int main(void) + unsigned char s[16]; + int ret = 0; + ++#if defined __powerpc64__ && defined _LITTLE_ENDIAN ++ /* Don't bother checking on ppc64le, we know it'll work, and ++ that what hdf5 calls 'special algorithm' simply is ++ IBM ldouble 128 (i.e. two seperately scaled doubles). ++ The check below assumes big endian. */ ++ ret = 0; ++#endif ++ + if(sizeof(long double) == 16) { + /*make sure the long double type is the same as the failing type + *which has 16 bytes in size and 11 bits of exponent. If it is, +diff --git a/hdf5-1.10.1/test/dt_arith.c b/hdf5-1.10.1/test/dt_arith.c +index 8f3e6e4..084b47c 100644 +--- a/test/dt_arith.c ++++ b/test/dt_arith.c +@@ -3051,7 +3051,18 @@ test_conv_flt_1 (const char *name, int run_test, hid_t src, hid_t dst) + buf, saved, nelmts); + #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0 + } else if(src_type == FLT_LDOUBLE) { +- INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, ++ size_t mant_dig = LDBL_MANT_DIG; ++ if (mant_dig >= src_nbits) { ++ /* This happens for IBM long double in little endian. ++ The macro LDBL_MANT_DIG says 106 mantissa bits, but the ++ HDF5 detection code actually represents it as a normal 64bit ++ double (52 bit mantissa) with the upper double being ++ unspec bits (which is sort of okay as the testsuite ++ wouldn't deal with that format correctly anyway). So ++ override the mantissa size. */ ++ mant_dig = 52; ++ } ++ INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size, + buf, saved, nelmts); + #endif + } else +@@ -3712,7 +3723,18 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) + INIT_FP_DENORM(long double, LDBL_MANT_DIG, src_size, src_nbits, sendian, dst_size, + buf, saved, nelmts); + } else { +- INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, buf, saved, nelmts); ++ size_t mant_dig = LDBL_MANT_DIG; ++ if (mant_dig >= src_nbits) { ++ /* This happens for IBM long double in little endian. ++ The macro LDBL_MANT_DIG says 106 mantissa bits, but the ++ HDF5 detection code actually represents it as a normal 64bit ++ double (52 bit mantissa) with the upper double being ++ unspec bits (which is sort of okay as the testsuite ++ wouldn't deal with that format correctly anyway). So ++ override the mantissa size. */ ++ mant_dig = 52; ++ } ++ INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size, buf, saved, nelmts); + } + #endif + } else diff --git a/hdf5-1.10.0-patch1.tar.bz2 b/hdf5-1.10.0-patch1.tar.bz2 deleted file mode 100644 index c5164e1..0000000 --- a/hdf5-1.10.0-patch1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f772264dd853dceb18855418a81c63c9cdcca7bcd075b9c54eb516af006fdfba -size 11233647 diff --git a/hdf5-1.10.1.tar.bz2 b/hdf5-1.10.1.tar.bz2 new file mode 100644 index 0000000..078f33a --- /dev/null +++ b/hdf5-1.10.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c5ce1e33d2463fb1a42dd04daacbc22104e57676e2204e3d66b1ef54b88ebf2 +size 11769617 diff --git a/hdf5-ldouble-ppc64le.patch b/hdf5-ldouble-ppc64le.patch deleted file mode 100644 index c56f214..0000000 --- a/hdf5-ldouble-ppc64le.patch +++ /dev/null @@ -1,112 +0,0 @@ -Index: hdf5-1.10.0-patch1/configure -=================================================================== ---- hdf5-1.10.0-patch1.orig/configure -+++ hdf5-1.10.0-patch1/configure -@@ -30356,6 +30356,14 @@ main () - unsigned char s2[8]; - int ret = 1; - -+#if defined __powerpc64__ && defined _LITTLE_ENDIAN -+ /* Don't bother checking on ppc64le, we know it'll work, and -+ that what hdf5 calls 'special algorithm' simply is -+ IBM ldouble 128 (i.e. two seperately scaled doubles). -+ The check below assumes big endian. */ -+ ret = 0; -+#endif -+ - if(sizeof(long double) == 16 && sizeof(long) == 8) { - /*make sure the long double type has 16 bytes in size and - * 11 bits of exponent. If it is, -@@ -30473,6 +30481,14 @@ main () - unsigned char s[16]; - int flag=0, ret=1; - -+#if defined __powerpc64__ && defined _LITTLE_ENDIAN -+ /* Don't bother checking on ppc64le, we know it'll work, and -+ that what hdf5 calls 'special algorithm' simply is -+ IBM ldouble 128 (i.e. two seperately scaled doubles). -+ The check below assumes big endian. */ -+ ret = 0; -+#endif -+ - /*Determine if long double has 16 byte in size, 11 bit exponent, and - *the bias is 0x3ff */ - if(sizeof(long double) == 16) { -Index: hdf5-1.10.0-patch1/configure.ac -=================================================================== ---- hdf5-1.10.0-patch1.orig/configure.ac -+++ hdf5-1.10.0-patch1/configure.ac -@@ -2813,6 +2813,14 @@ else - unsigned char s2[8]; - int ret = 1; - -+#if defined __powerpc64__ && defined _LITTLE_ENDIAN -+ /* Don't bother checking on ppc64le, we know it'll work, and -+ that what hdf5 calls 'special algorithm' simply is -+ IBM ldouble 128 (i.e. two seperately scaled doubles). -+ The check below assumes big endian. */ -+ ret = 0; -+#endif -+ - if(sizeof(long double) == 16 && sizeof(long) == 8) { - /*make sure the long double type has 16 bytes in size and - * 11 bits of exponent. If it is, -@@ -2973,6 +2981,14 @@ else - unsigned char s[16]; - int ret = 0; - -+#if defined __powerpc64__ && defined _LITTLE_ENDIAN -+ /* Don't bother checking on ppc64le, we know it'll work, and -+ that what hdf5 calls 'special algorithm' simply is -+ IBM ldouble 128 (i.e. two seperately scaled doubles). -+ The check below assumes big endian. */ -+ ret = 0; -+#endif -+ - if(sizeof(long double) == 16) { - /*make sure the long double type is the same as the failing type - *which has 16 bytes in size and 11 bits of exponent. If it is, -Index: hdf5-1.10.0-patch1/test/dt_arith.c -=================================================================== ---- hdf5-1.10.0-patch1.orig/test/dt_arith.c -+++ hdf5-1.10.0-patch1/test/dt_arith.c -@@ -3049,7 +3049,18 @@ test_conv_flt_1 (const char *name, int r - buf, saved, nelmts); - #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0 - } else if(src_type == FLT_LDOUBLE) { -- INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, -+ size_t mant_dig = LDBL_MANT_DIG; -+ if (mant_dig >= src_nbits) { -+ /* This happens for IBM long double in little endian. -+ The macro LDBL_MANT_DIG says 106 mantissa bits, but the -+ HDF5 detection code actually represents it as a normal 64bit -+ double (52 bit mantissa) with the upper double being -+ unspec bits (which is sort of okay as the testsuite -+ wouldn't deal with that format correctly anyway). So -+ override the mantissa size. */ -+ mant_dig = 52; -+ } -+ INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size, - buf, saved, nelmts); - #endif - } else -@@ -3710,7 +3721,18 @@ test_conv_int_fp(const char *name, int r - INIT_FP_DENORM(long double, LDBL_MANT_DIG, src_size, src_nbits, sendian, dst_size, - buf, saved, nelmts); - } else { -- INIT_FP_SPECIAL(src_size, src_nbits, sendian, LDBL_MANT_DIG, dst_size, buf, saved, nelmts); -+ size_t mant_dig = LDBL_MANT_DIG; -+ if (mant_dig >= src_nbits) { -+ /* This happens for IBM long double in little endian. -+ The macro LDBL_MANT_DIG says 106 mantissa bits, but the -+ HDF5 detection code actually represents it as a normal 64bit -+ double (52 bit mantissa) with the upper double being -+ unspec bits (which is sort of okay as the testsuite -+ wouldn't deal with that format correctly anyway). So -+ override the mantissa size. */ -+ mant_dig = 52; -+ } -+ INIT_FP_SPECIAL(src_size, src_nbits, sendian, mant_dig, dst_size, buf, saved, nelmts); - } - #endif - } else diff --git a/hdf5-non_void_return.patch b/hdf5-non_void_return.patch deleted file mode 100644 index 4ee3c74..0000000 --- a/hdf5-non_void_return.patch +++ /dev/null @@ -1,88 +0,0 @@ -Index: test/dt_arith.c -=================================================================== ---- test/dt_arith.c.orig -+++ test/dt_arith.c -@@ -3382,6 +3382,7 @@ error: - else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL) - return 1; - #endif -+ return 1; - } - - -Index: tools/h5ls/h5ls.c -=================================================================== ---- tools/h5ls/h5ls.c.orig -+++ tools/h5ls/h5ls.c -@@ -2567,7 +2567,7 @@ out: - * - *------------------------------------------------------------------------- - */ --static void -+static void __attribute__((__noreturn__)) - leave(int ret) - { - h5tools_close(); -Index: tools/h5dump/h5dump.c -=================================================================== ---- tools/h5dump/h5dump.c.orig -+++ tools/h5dump/h5dump.c -@@ -210,7 +210,7 @@ static struct long_options l_opts[] = { - * - *------------------------------------------------------------------------- - */ --static void -+static void __attribute__((__noreturn__)) - leave(int ret) - { - h5tools_close(); -Index: tools/h5copy/h5copy.c -=================================================================== ---- tools/h5copy/h5copy.c.orig -+++ tools/h5copy/h5copy.c -@@ -56,7 +56,7 @@ char *str_flag = NULL; - * - *------------------------------------------------------------------------- - */ --static void -+static void __attribute__((__noreturn__)) - leave(int ret) - { - if (fname_src) -Index: tools/misc/h5mkgrp.c -=================================================================== ---- tools/misc/h5mkgrp.c.orig -+++ tools/misc/h5mkgrp.c -@@ -60,7 +60,7 @@ param_t params; /* Command l - * - *------------------------------------------------------------------------- - */ --static void -+static void __attribute__((__noreturn__)) - leave(int ret) - { - int curr_group; -Index: test/filter_fail.c -=================================================================== ---- test/filter_fail.c.orig -+++ test/filter_fail.c -@@ -409,4 +409,6 @@ error: - nerrors, 1==nerrors?"":"S"); - HDexit(1); - } -+ -+ return 1; - } -Index: tools/h5stat/h5stat.c -=================================================================== ---- tools/h5stat/h5stat.c.orig -+++ tools/h5stat/h5stat.c -@@ -250,7 +250,7 @@ static struct long_options l_opts[] = { - { NULL, 0, '\0' } - }; - --static void -+static void __attribute__((__noreturn__)) - leave(int ret) - { - h5tools_close(); diff --git a/hdf5.changes b/hdf5.changes index f2171a0..38ac9ed 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Nov 7 13:23:40 UTC 2017 - eich@suse.com + +- Update to 1.10.1: + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1-RELEASE.txt +- Fix-warnings-for-missing-returns.patch: + replace: hdf5-non_void_return.patch +- PPC64LE-Fix-long-double-handling.patch: + replace: hdf5-ldouble-ppc64le.patch +- Disable-phdf5-tests.patch: + replace: hdf5_disable_testphdf5.patch +- Disabling validation tests for the MPI variant for now as they + seem to cause issues in OBS. + ------------------------------------------------------------------- Thu Oct 26 15:51:18 UTC 2017 - eich@suse.com diff --git a/hdf5.spec b/hdf5.spec index 6982290..14cc5d6 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -22,10 +22,10 @@ %define _do_check 1 %define use_sz2 0 -%define vers 1.10.0 -%define _vers 1_10_0 +%define vers 1.10.1 +%define _vers 1_10_1 %define short_ver 1.10 -%define src_ver %{version}-patch1 +%define src_ver %{version} %define pname hdf5 %bcond_with ringdisabled @@ -94,6 +94,11 @@ ExclusiveArch: do_not_build %global mpi_flavor mvapich2 %endif +# Disable until resource issue is resolved. +%if "%mpi_flavor" == "openmpi" +%define _do_check 0 +%endif + %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} %{?with_mpi:%{!?mpi_flavor:%global mpi_flavor openmpi}} @@ -137,13 +142,12 @@ ExclusiveArch: do_not_build # TODO: The so numbers autodetected by update_so_version.sh # do not match the so numbers that are actually buit. -%define sonum 100 -%define sonum_CXX 100 +%define sonum 101 +%define sonum_CXX 101 %define sonum_F 100 %define sonum_HL 100 %define sonum_HL_CXX 100 %define sonum_HL_F 100 -%define sonum_TOOLS 100 Name: %{package_name} Version: %vers @@ -156,16 +160,16 @@ Source0: http://www.hdfgroup.org/ftp/HDF5/releases/%{pname}-%{short_ver}/ Source100: _multibuild Source1000: update_so_version.sh Patch0: hdf5-LD_LIBRARY_PATH.patch -Patch1: hdf5-non_void_return.patch +Patch1: Fix-warnings-for-missing-returns.patch # not really needed but we want to get noticed if hdf5 doesn' t know our host Patch2: hdf5-1.8.11-abort_unknown_host_config.patch %ifarch %arm Patch4: hdf5-1.8.10-tests-arm.patch %endif -Patch5: hdf5-ldouble-ppc64le.patch +Patch5: PPC64LE-Fix-long-double-handling.patch Patch6: hdf5-buildcompare.patch Patch7: hdf5-mpi.patch -Patch8: hdf5_disable_testphdf5.patch +Patch8: Disable-phdf5-tests.patch BuildRequires: fdupes %if 0%{?use_sz2} BuildRequires: libsz2-devel @@ -557,9 +561,9 @@ library packages. %prep %{?with_hpc: %hpc_debug} -%setup -q -n %{pname}-%{version}-patch1 +%setup -q -n %{pname}-%{version} %patch0 -p1 -b .LD_LIBRARY_PATH -%patch1 -p0 -b .non_void_return +%patch1 -p1 %patch2 -p0 -b .abort_unknown_host_config %ifarch %arm %patch4 -p0 -b .tests-arm diff --git a/hdf5_disable_testphdf5.patch b/hdf5_disable_testphdf5.patch deleted file mode 100644 index ab55d4a..0000000 --- a/hdf5_disable_testphdf5.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Michel Normand -Subject: hdf5 disable testphdf5 -Date: Tue, 06 Sep 2016 10:55:48 +0200 - -hdf5 disable testphdf5 temporarily as long as bug not solved -https://bugzilla.suse.com/show_bug.cgi?id=997252 - -Signed-off-by: Michel Normand ---- - testpar/CMakeTests.cmake | 2 -- - testpar/Makefile.in | 2 +- - 2 files changed, 1 insertion(+), 3 deletions(-) - -Index: hdf5-1.10.0-patch1/testpar/CMakeTests.cmake -=================================================================== ---- hdf5-1.10.0-patch1.orig/testpar/CMakeTests.cmake -+++ hdf5-1.10.0-patch1/testpar/CMakeTests.cmake -@@ -5,8 +5,6 @@ - ############################################################################## - ############################################################################## - --add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $) -- - foreach (testp ${H5P_TESTS}) - add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $) - endforeach (testp ${H5P_TESTS}) -Index: hdf5-1.10.0-patch1/testpar/Makefile.in -=================================================================== ---- hdf5-1.10.0-patch1.orig/testpar/Makefile.in -+++ hdf5-1.10.0-patch1/testpar/Makefile.in -@@ -771,7 +771,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.c - - # Test programs. These are our main targets. - # --TEST_PROG_PARA = t_mpi testphdf5 t_cache t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame -+TEST_PROG_PARA = t_mpi t_cache t_pflush1 t_pflush2 t_pshutdown t_prestart t_init_term t_shapesame - testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_file_image.c t_mdset.c \ - t_ph5basic.c t_coll_chunk.c t_span_tree.c t_chunk_alloc.c t_filter_read.c \ - t_prop.c