commit: c824e7f785234989a5cab975b46a2792603d25b7 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Mon Sep 26 15:19:57 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Sep 26 15:20:09 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c824e7f7
sci-libs/hdf5: Allow cxx & mpi at the same time. This allows to install sci-lib/flann-1.9.1[mpi] for example. See: http://hdf-forum.184993.n3.nabble.com/hdf-forum-HDF5-enable-cxx-enable-threadsafe-conflict-ubuntu-debian-packages-td194242.html Package-Manager: portage-2.3.1 sci-libs/hdf5/hdf5-1.8.17.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sci-libs/hdf5/hdf5-1.8.17.ebuild b/sci-libs/hdf5/hdf5-1.8.17.ebuild index 8393c0c..7b186c5 100644 --- a/sci-libs/hdf5/hdf5-1.8.17.ebuild +++ b/sci-libs/hdf5/hdf5-1.8.17.ebuild @@ -21,7 +21,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linu IUSE="cxx debug examples fortran fortran2003 +hl mpi static-libs szip threads zlib" REQUIRED_USE=" - cxx? ( !mpi ) mpi? ( !cxx ) threads? ( !cxx !mpi !fortran !hl ) fortran2003? ( fortran )" @@ -56,6 +55,11 @@ pkg_setup() { fi export CC=mpicc use fortran && export FC=mpif90 + if use cxx ; then + export CXX=mpicxx + ewarn "USE='mpi cxx' requires a configuration unsupported by upstream. Use at your own risk." + ewarn "In particular, the C++ API is not parallel safe." + fi elif has_version 'sci-libs/hdf5[mpi]'; then ewarn "Installing hdf5 with mpi disabled while having hdf5 installed with mpi enabled may fail." ewarn "Try to uninstall the current hdf5 prior to disabling mpi support." @@ -100,6 +104,7 @@ src_configure() { $(use_with szip szlib) $(use_with threads pthread) $(use_with zlib) + $(use mpi && use cxx && echo --enable-unsupported) ) autotools-utils_src_configure }
