Accepting request 649960 from home:eeich:branches:science
- Update to 1.10.4: https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4/src/hdf5-1.10.4-RELEASE.txt * Update Disable-phdf5-tests.patch * Replace and update hdf5-buildcompare.patch by hdf5-Remove-timestamps-from-binaries.patch - Remove lib*_cpp and lib*_hl_cpp dependencies for MPI for the time being. OBS-URL: https://build.opensuse.org/request/show/649960 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=86
This commit is contained in:
Git OBS Bridge
parent
67691f34f4
commit
916d4a62db
@ -1,18 +1,18 @@
|
||||
From: Egbert Eich <eich@suse.com>
|
||||
Date: Tue Nov 7 16:06:07 2017 +0100
|
||||
Subject: [PATCH]- Disable phdf5 tests.
|
||||
Git-commit: 8b3e39a25d72b9dad5a5b13fb313226abf294069
|
||||
Date: Sat Nov 17 20:11:13 2018 +0100
|
||||
Subject: Disable phdf5 tests
|
||||
Patch-mainline: never
|
||||
Git-commit: 16d758d17d9c49ab9e34d510675929b9ccc8be5a
|
||||
References:
|
||||
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||
|
||||
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||
Signed-off-by: Egbert Eich <eich@suse.de>
|
||||
---
|
||||
testpar/CMakeTests.cmake | 2 +-
|
||||
testpar/Makefile.am | 2 +-
|
||||
testpar/Makefile.in | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
diff --git a/testpar/CMakeTests.cmake b/testpar/CMakeTests.cmake
|
||||
index 6e2b05e..75a65ab 100644
|
||||
index 87470f3..ce2f2e4 100644
|
||||
--- a/testpar/CMakeTests.cmake
|
||||
+++ b/testpar/CMakeTests.cmake
|
||||
@@ -16,7 +16,7 @@
|
||||
@ -20,12 +20,12 @@ index 6e2b05e..75a65ab 100644
|
||||
##############################################################################
|
||||
|
||||
-add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS})
|
||||
+## add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS})
|
||||
+##add_test (NAME TEST_PAR_testphdf5 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:testphdf5> ${MPIEXEC_POSTFLAGS})
|
||||
|
||||
foreach (testp ${H5P_TESTS})
|
||||
add_test (NAME TEST_PAR_${testp} COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:${testp}> ${MPIEXEC_POSTFLAGS})
|
||||
diff --git a/testpar/Makefile.am b/testpar/Makefile.am
|
||||
index b87c1df..27af0df 100644
|
||||
index 7262ca6..e9c8c4a 100644
|
||||
--- a/testpar/Makefile.am
|
||||
+++ b/testpar/Makefile.am
|
||||
@@ -23,7 +23,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test
|
||||
@ -37,16 +37,3 @@ index b87c1df..27af0df 100644
|
||||
|
||||
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
|
||||
@@ -799,7 +799,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 MPItest.h5 \
|
||||
|
||||
# Test programs. These are our main targets.
|
||||
#
|
||||
-TEST_PROG_PARA = t_mpi t_bigio testphdf5 t_cache t_cache_image t_pflush1 t_pflush2 t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel
|
||||
+TEST_PROG_PARA = t_mpi t_bigio t_cache t_cache_image t_pflush1 t_pflush2 t_pread t_pshutdown t_prestart t_init_term t_shapesame t_filters_parallel
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c65cdcce4724a57fd3f8da9f0d109b497be30092acb9fac634d1291190d905a9
|
||||
size 8591338
|
||||
3
hdf5-1.10.4.tar.bz2
Normal file
3
hdf5-1.10.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5af3109894f3db26caeac20536be70a932a43bd5aafcb348e972eb6dccbc6fd6
|
||||
size 8941831
|
||||
38
hdf5-Remove-timestamps-from-binaries.patch
Normal file
38
hdf5-Remove-timestamps-from-binaries.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From: Egbert Eich <eich@suse.com>
|
||||
Date: Sat Nov 17 18:15:13 2018 +0100
|
||||
Subject: hdf5: Remove timestamps from binaries
|
||||
Patch-mainline: never
|
||||
Git-commit: 3b88045491c0b43f385edce47e3aae07660cd9f3
|
||||
References:
|
||||
|
||||
Signed-off-by: Egbert Eich <eich@suse.com>
|
||||
Signed-off-by: Egbert Eich <eich@suse.de>
|
||||
---
|
||||
src/H5detect.c | 15 ---------------
|
||||
1 file changed, 15 deletions(-)
|
||||
diff --git a/src/H5detect.c b/src/H5detect.c
|
||||
index 4424009..f49774c 100644
|
||||
--- a/src/H5detect.c
|
||||
+++ b/src/H5detect.c
|
||||
@@ -1245,21 +1245,6 @@ bit.\n";
|
||||
fprintf(rawoutstream, "/* Generated automatically by H5detect -- do not edit */\n\n\n");
|
||||
HDfputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */
|
||||
|
||||
- fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n",
|
||||
- month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year);
|
||||
- if(pwd || real_name[0] || host_name[0]) {
|
||||
- fprintf(rawoutstream, " *\t\t\t");
|
||||
- if(real_name[0])
|
||||
- fprintf(rawoutstream, "%s <", real_name);
|
||||
-#ifdef H5_HAVE_GETPWUID
|
||||
- if(pwd) HDfputs(pwd->pw_name, rawoutstream);
|
||||
-#endif
|
||||
- if(host_name[0])
|
||||
- fprintf(rawoutstream, "@%s", host_name);
|
||||
- if(real_name[0])
|
||||
- fprintf(rawoutstream, ">");
|
||||
- HDfputc('\n', rawoutstream);
|
||||
- }
|
||||
fprintf(rawoutstream, " *\n * Purpose:\t\t");
|
||||
for(s = purpose; *s; s++) {
|
||||
HDfputc(*s, rawoutstream);
|
||||
@ -1,43 +0,0 @@
|
||||
---
|
||||
src/H5detect.c | 12 ------------
|
||||
src/libhdf5.settings.in | 3 ---
|
||||
2 files changed, 15 deletions(-)
|
||||
|
||||
Index: hdf5-1.10.0-patch1/src/H5detect.c
|
||||
===================================================================
|
||||
--- hdf5-1.10.0-patch1.orig/src/H5detect.c
|
||||
+++ hdf5-1.10.0-patch1/src/H5detect.c
|
||||
@@ -1311,18 +1311,6 @@ bit.\n";
|
||||
printf("/* Generated automatically by H5detect -- do not edit */\n\n\n");
|
||||
HDputs(FileHeader); /*the copyright notice--see top of this file */
|
||||
|
||||
- printf(" *\n * Created:\t\t%s %2d, %4d\n",
|
||||
- month_name[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year);
|
||||
- if (pwd || real_name[0] || host_name[0]) {
|
||||
- printf(" *\t\t\t");
|
||||
- if (real_name[0]) printf("%s <", real_name);
|
||||
-#ifdef H5_HAVE_GETPWUID
|
||||
- if (pwd) HDfputs(pwd->pw_name, stdout);
|
||||
-#endif
|
||||
- if (host_name[0]) printf("@%s", host_name);
|
||||
- if (real_name[0]) printf(">");
|
||||
- HDputchar('\n');
|
||||
- }
|
||||
printf(" *\n * Purpose:\t\t");
|
||||
for (s = purpose; *s; s++) {
|
||||
HDputchar(*s);
|
||||
Index: hdf5-1.10.0-patch1/src/libhdf5.settings.in
|
||||
===================================================================
|
||||
--- hdf5-1.10.0-patch1.orig/src/libhdf5.settings.in
|
||||
+++ hdf5-1.10.0-patch1/src/libhdf5.settings.in
|
||||
@@ -4,10 +4,7 @@
|
||||
General Information:
|
||||
-------------------
|
||||
HDF5 Version: @H5_VERSION@
|
||||
- Configured on: @CONFIG_DATE@
|
||||
- Configured by: @CONFIG_USER@
|
||||
Host system: @host_cpu@-@host_vendor@-@host_os@
|
||||
- Uname information: @UNAME_INFO@
|
||||
Byte sex: @BYTESEX@
|
||||
Installation point: @prefix@
|
||||
|
||||
15
hdf5.changes
15
hdf5.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 17 17:21:00 UTC 2018 - eich@suse.com
|
||||
|
||||
- Update to 1.10.4:
|
||||
https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.4/src/hdf5-1.10.4-RELEASE.txt
|
||||
* Update Disable-phdf5-tests.patch
|
||||
* Replace and update hdf5-buildcompare.patch by
|
||||
hdf5-Remove-timestamps-from-binaries.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 16 23:09:01 UTC 2018 - eich@suse.com
|
||||
|
||||
- Remove lib*_cpp and lib*_hl_cpp dependencies for MPI for the time
|
||||
being.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Nov 11 12:15:14 UTC 2018 - eich@suse.com
|
||||
|
||||
|
||||
10
hdf5.spec
10
hdf5.spec
@ -28,8 +28,8 @@
|
||||
%define _do_check 1
|
||||
%define use_sz2 0
|
||||
|
||||
%define vers 1.10.3
|
||||
%define _vers 1_10_3
|
||||
%define vers 1.10.4
|
||||
%define _vers 1_10_4
|
||||
%define short_ver 1.10
|
||||
%define src_ver %{version}
|
||||
%define pname hdf5
|
||||
@ -217,7 +217,7 @@ Patch2: hdf5-1.8.11-abort_unknown_host_config.patch
|
||||
Patch4: hdf5-1.8.10-tests-arm.patch
|
||||
%endif
|
||||
Patch5: PPC64LE-Fix-long-double-handling.patch
|
||||
Patch6: hdf5-buildcompare.patch
|
||||
Patch6: hdf5-Remove-timestamps-from-binaries.patch
|
||||
Patch7: hdf5-mpi.patch
|
||||
Patch8: Disable-phdf5-tests.patch
|
||||
Patch9: 0001-Fix-return-value-in-test_libver_bounds_open.patch
|
||||
@ -241,9 +241,11 @@ Requires: lib%{pname}_hl%{sonum_HL} = %{version}
|
||||
Requires: lib%{pname}hl_fortran%{sonum_HL_F} = %{version}
|
||||
%else # hpc
|
||||
%hpc_requires
|
||||
Requires: %{libname -l _cpp}
|
||||
Requires: %{libname -l _fortran}
|
||||
%if %{without mpi}
|
||||
Requires: %{libname -l _cpp}
|
||||
Requires: %{libname -l _hl_cpp}
|
||||
%endif
|
||||
Requires: %{libname -l _hl}
|
||||
Requires: %{libname -l hl_fortran}
|
||||
Requires: %{libname}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user