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 32B4F138330 for ; Mon, 26 Sep 2016 15:20:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCFCFE0B88; Mon, 26 Sep 2016 15:20:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAF67E0B88 for ; Mon, 26 Sep 2016 15:20:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8096F3405BB for ; Mon, 26 Sep 2016 15:20:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E252245E for ; Mon, 26 Sep 2016 15:20:44 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1474903209.c824e7f785234989a5cab975b46a2792603d25b7.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/hdf5/hdf5-1.8.17.ebuild X-VCS-Directories: sci-libs/hdf5/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: c824e7f785234989a5cab975b46a2792603d25b7 X-VCS-Branch: master Date: Mon, 26 Sep 2016 15:20:44 +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: 8806981a-50ac-487e-9be6-360c329e77d9 X-Archives-Hash: 0fa46814a908fb0a6fd4ab5962fecdb8 commit: c824e7f785234989a5cab975b46a2792603d25b7 Author: Alexis Ballier gentoo org> AuthorDate: Mon Sep 26 15:19:57 2016 +0000 Commit: Alexis Ballier gentoo 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 }