| 1 |
commit: aef8cfc47a055dcaba51f431a4580256beb262b1 |
| 2 |
Author: Slawomir Lis <slis <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 28 07:01:11 2017 +0000 |
| 4 |
Commit: Slawek Lis <slis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 28 07:01:11 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef8cfc4 |
| 7 |
|
| 8 |
sci-libs/silo: added patch to fix hdf5 mpi compile problem |
| 9 |
|
| 10 |
Bug reported: 625794 |
| 11 |
|
| 12 |
Reported-by: deference <AT> null.net |
| 13 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 14 |
|
| 15 |
sci-libs/silo/files/silo-4.10.2-mpiposix.patch | 53 ++++++++++++++++++++++++++ |
| 16 |
sci-libs/silo/silo-4.10.2.ebuild | 3 +- |
| 17 |
2 files changed, 55 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/sci-libs/silo/files/silo-4.10.2-mpiposix.patch b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..30a3f910b19 |
| 22 |
--- /dev/null |
| 23 |
+++ b/sci-libs/silo/files/silo-4.10.2-mpiposix.patch |
| 24 |
@@ -0,0 +1,53 @@ |
| 25 |
+--- src/hdf5_drv/silo_hdf5.c.orig 2017-07-28 08:52:09.026638768 +0200 |
| 26 |
++++ src/hdf5_drv/silo_hdf5.c 2017-07-28 09:00:12.306635882 +0200 |
| 27 |
+@@ -4752,18 +4752,19 @@ |
| 28 |
+ } |
| 29 |
+ |
| 30 |
+ /* default HDF5 mpi drivers */ |
| 31 |
+- case DB_FILE_OPTS_H5_DEFAULT_MPIP: |
| 32 |
+- { |
| 33 |
+-#ifdef H5_HAVE_PARALLEL |
| 34 |
+- h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE); |
| 35 |
+-#else |
| 36 |
+- H5Pclose(retval); |
| 37 |
+- return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me); |
| 38 |
+-#endif |
| 39 |
+- break; |
| 40 |
+- } |
| 41 |
++// case DB_FILE_OPTS_H5_DEFAULT_MPIP: |
| 42 |
++// { |
| 43 |
++//#ifdef H5_HAVE_PARALLEL |
| 44 |
++// h5status |= H5Pset_fapl_mpiposix(retval, MPI_COMM_SELF, TRUE); |
| 45 |
++//#else |
| 46 |
++// H5Pclose(retval); |
| 47 |
++// return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me); |
| 48 |
++//#endif |
| 49 |
++// break; |
| 50 |
++// } |
| 51 |
+ |
| 52 |
+ case DB_FILE_OPTS_H5_DEFAULT_MPIO: |
| 53 |
++ case DB_FILE_OPTS_H5_DEFAULT_MPIP: |
| 54 |
+ { |
| 55 |
+ #ifdef H5_HAVE_PARALLEL |
| 56 |
+ MPI_Info info; |
| 57 |
+@@ -5069,15 +5070,15 @@ |
| 58 |
+ if ((p = DBGetOption(opts, DBOPT_H5_MPIP_NO_GPFS_HINTS))) |
| 59 |
+ use_gpfs_hints = FALSE; |
| 60 |
+ |
| 61 |
+- if (vfd == DB_H5VFD_MPIO) |
| 62 |
++// if (vfd == DB_H5VFD_MPIO) |
| 63 |
+ { |
| 64 |
+ h5status |= H5Pset_fapl_mpio(retval, mpi_comm, mpi_info); |
| 65 |
+ if (created_info) MPI_Info_free(&mpi_info); |
| 66 |
+ } |
| 67 |
+- else |
| 68 |
+- { |
| 69 |
+- h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints); |
| 70 |
+- } |
| 71 |
++// else |
| 72 |
++// { |
| 73 |
++// h5status |= H5Pset_fapl_mpiposix(retval, mpi_comm, use_gpfs_hints); |
| 74 |
++// } |
| 75 |
+ #else |
| 76 |
+ H5Pclose(retval); |
| 77 |
+ return db_perror("HDF5 MPI VFD", E_NOTENABLEDINBUILD, me); |
| 78 |
|
| 79 |
diff --git a/sci-libs/silo/silo-4.10.2.ebuild b/sci-libs/silo/silo-4.10.2.ebuild |
| 80 |
index e222f939d51..0c77dba873a 100644 |
| 81 |
--- a/sci-libs/silo/silo-4.10.2.ebuild |
| 82 |
+++ b/sci-libs/silo/silo-4.10.2.ebuild |
| 83 |
@@ -1,4 +1,4 @@ |
| 84 |
-# Copyright 1999-2015 Gentoo Foundation |
| 85 |
+# Copyright 1999-2017 Gentoo Foundation |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
|
| 88 |
EAPI=5 |
| 89 |
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}" |
| 90 |
src_prepare() { |
| 91 |
epatch "${FILESDIR}/${P}-qtlibs.patch" |
| 92 |
epatch "${FILESDIR}/${P}-tests.patch" |
| 93 |
+ epatch "${FILESDIR}/${P}-mpiposix.patch" |
| 94 |
} |
| 95 |
|
| 96 |
src_configure() { |
Archives