From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4486A139694 for ; Fri, 28 Jul 2017 07:05:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A4C51FC0A5; Fri, 28 Jul 2017 07:05:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 392121FC0A5 for ; Fri, 28 Jul 2017 07:05:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAD87341942 for ; Fri, 28 Jul 2017 07:05:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3369D74B7 for ; Fri, 28 Jul 2017 07:05:00 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1501225271.aef8cfc47a055dcaba51f431a4580256beb262b1.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/silo/files/, sci-libs/silo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/silo/files/silo-4.10.2-mpiposix.patch sci-libs/silo/silo-4.10.2.ebuild X-VCS-Directories: sci-libs/silo/ sci-libs/silo/files/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: aef8cfc47a055dcaba51f431a4580256beb262b1 X-VCS-Branch: master Date: Fri, 28 Jul 2017 07:05:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 96a490cc-8460-4c19-a388-7cc9be226d40 X-Archives-Hash: f1ec56572e462485cc05565a50fc6f7b commit: aef8cfc47a055dcaba51f431a4580256beb262b1 Author: Slawomir Lis gentoo org> AuthorDate: Fri Jul 28 07:01:11 2017 +0000 Commit: Slawek Lis gentoo 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 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() {