commit: aef8cfc47a055dcaba51f431a4580256beb262b1
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 07:01:11 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 07:01:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef8cfc4
sci-libs/silo: added patch to fix hdf5 mpi compile problem
Bug reported: 625794
Reported-by: deference <AT> null.net
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sci-libs/silo/files/silo-4.10.2-mpiposix.patch | 53 ++++++++++++++++++++++++++
sci-libs/silo/silo-4.10.2.ebuild | 3 +-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
new file mode 100644
index 00000000000..30a3f910b19
--- /dev/null
+++ b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch
@@ -0,0 +1,53 @@
+--- src/hdf5_drv/silo_hdf5.c.orig 2017-07-28 08:52:09.026638768 +0200
++++ src/hdf5_drv/silo_hdf5.c 2017-07-28 09:00:12.306635882 +0200
+@@ -4752,18 +4752,19 @@
+ }
+
+ /* default HDF5 mpi drivers */
+- case DB_FILE_OPTS_H5_DEFAULT_MPIP:
+- {
+-#ifdef H5_HAVE_PARALLEL
+- h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
+-#else
+- H5Pclose(retval);
+- return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
+-#endif
+- break;
+- }
++// case DB_FILE_OPTS_H5_DEFAULT_MPIP:
++// {
++//#ifdef H5_HAVE_PARALLEL
++// h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE);
++//#else
++// H5Pclose(retval);
++// return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
++//#endif
++// break;
++// }
+
+ case DB_FILE_OPTS_H5_DEFAULT_MPIO:
++ case DB_FILE_OPTS_H5_DEFAULT_MPIP:
+ {
+ #ifdef H5_HAVE_PARALLEL
+ MPI_Info info;
+@@ -5069,15 +5070,15 @@
+ if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS)))
+ use_gpfs_hints = FALSE;
+
+- if (vfd == DB_H5VFD_MPIO)
++// if (vfd == DB_H5VFD_MPIO)
+ {
+ h5status |= H5Pset_fapl_mpio(retval, mpi_comm,
mpi_info);
+ if (created_info) MPI_Info_free(&mpi_info);
+ }
+- else
+- {
+- h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm,
use_gpfs_hints);
+- }
++// else
++// {
++// h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm,
use_gpfs_hints);
++// }
+ #else
+ H5Pclose(retval);
+ return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me);
diff --git a/sci-libs/silo/silo-4.10.2.ebuild b/sci-libs/silo/silo-4.10.2.ebuild
index e222f939d51..0c77dba873a 100644
--- a/sci-libs/silo/silo-4.10.2.ebuild
+++ b/sci-libs/silo/silo-4.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}/${P}-qtlibs.patch"
epatch "${FILESDIR}/${P}-tests.patch"
+ epatch "${FILESDIR}/${P}-mpiposix.patch"
}
src_configure() {
