From a5a06c5b4ef14d1385f05be0a3d25161dac6e57a71d703248577a50486590c87 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 20 May 2015 21:44:45 +0000 Subject: [PATCH] Accepting request 306387 from devel:libraries:c_c++ - update hdf5-non_void_return.patch for GCC 5.x OBS-URL: https://build.opensuse.org/request/show/306387 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdf5?expand=0&rev=22 --- hdf5-1.8.11-abort_unknown_host_config.patch | 32 ++++--- hdf5-LD_LIBRARY_PATH.patch | 10 ++- hdf5-configure-long-double.patch | 20 ++--- hdf5-ldouble-ppc64le.patch | 30 +++---- hdf5-non_void_return.patch | 97 ++++++++++++++++++++- hdf5.changes | 5 ++ hdf5.spec | 4 +- 7 files changed, 148 insertions(+), 50 deletions(-) diff --git a/hdf5-1.8.11-abort_unknown_host_config.patch b/hdf5-1.8.11-abort_unknown_host_config.patch index a9ea040..77da571 100644 --- a/hdf5-1.8.11-abort_unknown_host_config.patch +++ b/hdf5-1.8.11-abort_unknown_host_config.patch @@ -1,17 +1,8 @@ ---- 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 +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -4214,6 +4214,8 @@ done if test "X$host_config" != "Xnone"; then CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`" . $host_config @@ -19,4 +10,17 @@ + as_fn_error $? "no usable host config found" "$LINENO" 5 fi + ## Source any special site-specific file +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -305,6 +305,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 diff --git a/hdf5-LD_LIBRARY_PATH.patch b/hdf5-LD_LIBRARY_PATH.patch index 8864656..80d2ef7 100644 --- a/hdf5-LD_LIBRARY_PATH.patch +++ b/hdf5-LD_LIBRARY_PATH.patch @@ -1,6 +1,8 @@ ---- hdf5-1.8.10/src/Makefile.in.orig 2012-10-27 02:14:55.000000000 +0200 -+++ hdf5-1.8.10/src/Makefile.in 2012-11-17 11:11:17.755746326 +0100 -@@ -1327,8 +1327,6 @@ help: +Index: hdf5-1.8.14/src/Makefile.in +=================================================================== +--- hdf5-1.8.14.orig/src/Makefile.in ++++ hdf5-1.8.14/src/Makefile.in +@@ -1667,8 +1667,6 @@ help: # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. H5Tinit.c: H5detect$(EXEEXT) @@ -9,7 +11,7 @@ $(RUNSERIAL) ./H5detect$(EXEEXT) > $@ || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ ($(RM) $@ ; exit 1) -@@ -1339,8 +1337,6 @@ H5Tinit.c: H5detect$(EXEEXT) +@@ -1679,8 +1677,6 @@ H5Tinit.c: H5detect$(EXEEXT) # Remove the generated .c file if errors occur unless HDF5_Make_Ignore # is set to ignore the error. H5lib_settings.c: H5make_libsettings$(EXEEXT) libhdf5.settings diff --git a/hdf5-configure-long-double.patch b/hdf5-configure-long-double.patch index c400807..23db859 100644 --- a/hdf5-configure-long-double.patch +++ b/hdf5-configure-long-double.patch @@ -1,8 +1,8 @@ -Index: hdf5-1.8.11/configure +Index: hdf5-1.8.14/configure =================================================================== ---- hdf5-1.8.11.orig/configure -+++ hdf5-1.8.11/configure -@@ -30201,7 +30201,7 @@ else +--- hdf5-1.8.14.orig/configure ++++ hdf5-1.8.14/configure +@@ -30288,7 +30288,7 @@ else /* Test if the last 2 bytes of mantissa are lost. Mainly for FreeBSD on Intel * architecture(sleipnir) where it happens. */ /*if(endian==0 && c2[0]==0 && c2[1]==0)*/ /*little endian*/ @@ -11,7 +11,7 @@ Index: hdf5-1.8.11/configure ret = 1; goto done; } -@@ -30220,16 +30220,16 @@ else +@@ -30307,16 +30307,16 @@ else * instead of 0x0000403effffffffffffffff, 0x0000403efffffffffffffffe, ..., * 0x0000403efffffffffffff000 ... */ @@ -31,11 +31,11 @@ Index: hdf5-1.8.11/configure exit(ret); } -Index: hdf5-1.8.11/configure.ac +Index: hdf5-1.8.14/configure.ac =================================================================== ---- hdf5-1.8.11.orig/configure.ac -+++ hdf5-1.8.11/configure.ac -@@ -3665,7 +3665,7 @@ else +--- hdf5-1.8.14.orig/configure.ac ++++ hdf5-1.8.14/configure.ac +@@ -3625,7 +3625,7 @@ else /* Test if the last 2 bytes of mantissa are lost. Mainly for FreeBSD on Intel * architecture(sleipnir) where it happens. */ /*if(endian==0 && c2[0]==0 && c2[1]==0)*/ /*little endian*/ @@ -44,7 +44,7 @@ Index: hdf5-1.8.11/configure.ac ret = 1; goto done; } -@@ -3684,16 +3684,16 @@ else +@@ -3644,16 +3644,16 @@ else * instead of 0x0000403effffffffffffffff, 0x0000403efffffffffffffffe, ..., * 0x0000403efffffffffffff000 ... */ diff --git a/hdf5-ldouble-ppc64le.patch b/hdf5-ldouble-ppc64le.patch index b941742..de38995 100644 --- a/hdf5-ldouble-ppc64le.patch +++ b/hdf5-ldouble-ppc64le.patch @@ -1,8 +1,8 @@ -Index: hdf5-1.8.12/configure +Index: hdf5-1.8.14/configure =================================================================== ---- hdf5-1.8.12/configure.orig -+++ hdf5-1.8.12/configure -@@ -30364,6 +30364,13 @@ else +--- hdf5-1.8.14.orig/configure ++++ hdf5-1.8.14/configure +@@ -30438,6 +30438,13 @@ else unsigned char s2[8]; int ret = 1; @@ -16,7 +16,7 @@ Index: hdf5-1.8.12/configure 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, -@@ -30468,6 +30475,13 @@ else +@@ -30542,6 +30549,13 @@ else unsigned char s[16]; int flag=0, ret=1; @@ -30,11 +30,11 @@ Index: hdf5-1.8.12/configure /*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.8.12/configure.ac +Index: hdf5-1.8.14/configure.ac =================================================================== ---- hdf5-1.8.12/configure.ac.orig -+++ hdf5-1.8.12/configure.ac -@@ -3768,6 +3768,13 @@ else +--- hdf5-1.8.14.orig/configure.ac ++++ hdf5-1.8.14/configure.ac +@@ -3723,6 +3723,13 @@ else unsigned char s2[8]; int ret = 1; @@ -48,7 +48,7 @@ Index: hdf5-1.8.12/configure.ac 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, -@@ -3846,6 +3853,13 @@ else +@@ -3801,6 +3808,13 @@ else unsigned char s[16]; int flag=0, ret=1; @@ -62,11 +62,11 @@ Index: hdf5-1.8.12/configure.ac /*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.8.12/test/dt_arith.c +Index: hdf5-1.8.14/test/dt_arith.c =================================================================== ---- hdf5-1.8.12/test/dt_arith.c.orig -+++ hdf5-1.8.12/test/dt_arith.c -@@ -3072,7 +3072,18 @@ test_conv_flt_1 (const char *name, int r +--- hdf5-1.8.14.orig/test/dt_arith.c ++++ hdf5-1.8.14/test/dt_arith.c +@@ -3088,7 +3088,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) { @@ -86,7 +86,7 @@ Index: hdf5-1.8.12/test/dt_arith.c buf, saved, nelmts); #endif } else -@@ -3808,7 +3819,18 @@ test_conv_int_fp(const char *name, int r +@@ -3824,7 +3835,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 { diff --git a/hdf5-non_void_return.patch b/hdf5-non_void_return.patch index fbbf3f5..86e8014 100644 --- a/hdf5-non_void_return.patch +++ b/hdf5-non_void_return.patch @@ -1,12 +1,101 @@ Index: test/dt_arith.c =================================================================== ---- test/dt_arith.c.orig 2011-11-27 14:22:13.000000000 +0100 -+++ test/dt_arith.c 2011-11-27 14:22:21.908435252 +0100 -@@ -3470,6 +3470,7 @@ error: +--- test/dt_arith.c.orig ++++ test/dt_arith.c +@@ -3497,6 +3497,7 @@ error: else if(run_test==TEST_DENORM || run_test==TEST_SPECIAL) return 1; #endif -+ return 1; // return from non void fix ++ return 1; } +Index: tools/h5ls/h5ls.c +=================================================================== +--- tools/h5ls/h5ls.c.orig ++++ tools/h5ls/h5ls.c +@@ -2528,7 +2528,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 +@@ -208,7 +208,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/h5repack/h5repack_main.c +=================================================================== +--- tools/h5repack/h5repack_main.c.orig ++++ tools/h5repack/h5repack_main.c +@@ -21,7 +21,7 @@ + #define PROGRAMNAME "h5repack" + + static int parse_command_line(int argc, const char **argv, pack_opt_t* options); +-static void leave(int ret); ++static void leave(int ret) __attribute__((__noreturn__)); + + + /* module-scoped variables */ +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 +@@ -223,7 +223,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 7b095a3..b67a46c 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 11 13:37:50 UTC 2015 - dmueller@suse.com + +- update hdf5-non_void_return.patch for GCC 5.x + ------------------------------------------------------------------- Tue Jan 13 11:07:12 CET 2015 - pth@suse.de diff --git a/hdf5.spec b/hdf5.spec index a5564eb..ec36e9f 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -1,7 +1,7 @@ # # spec file for package hdf5 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -206,7 +206,6 @@ scientific data. This package provides the static libraries. %endif -%if 0%{?_mvapich2} %package -n %{name}-mvapich2 Summary: A general purpose library and file format for storing scientific data Group: Development/Libraries/Other @@ -273,7 +272,6 @@ I/O libraries and tools for analyzing, visualizing, and converting scientific data. This package provides the static libraries. -%endif %prep %setup -q