[gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/

[Christoph Junghans]

commit:     cf6efbd2476d172bb53098968a1751b5c52c5edc
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 22:42:32 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 22:42:32 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cf6efbd2

enabled multilib cuda

Package-Manager: portage-2.2.14

---
 sys-cluster/openmpi/ChangeLog               | 3 +++
 sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index ba79a0b..3b947c3 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   20 Feb 2015; Christoph Junghans <ott...@gentoo.org> openmpi-1.8.4-r3.ebuild:
+  enabled multilib cuda
+
+  20 Feb 2015; Christoph Junghans <ott...@gentoo.org> openmpi-1.8.4-r3.ebuild:
   added fortran hack for bug #540508
 
 *openmpi-1.8.4-r3 (19 Feb 2015)

diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild 
b/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
index 306bede..f599615 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
@@ -54,6 +54,7 @@ MPI_UNCLASSED_DEP_STR="
                !app-text/lcdf-typetools
        )"
 
+# dev-util/nvidia-cuda-toolkit is always multilib
 RDEPEND="
        !sys-cluster/mpich
        !sys-cluster/mpich2
@@ -62,7 +63,7 @@ RDEPEND="
        dev-libs/libltdl:0[${MULTILIB_USEDEP}]
        >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
        >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-       cuda? ( dev-util/nvidia-cuda-toolkit )
+       cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
        elibc_FreeBSD? ( dev-libs/libexecinfo )
        openmpi_fabrics_ofed? ( sys-infiniband/ofed:* )
        openmpi_fabrics_knem? ( sys-cluster/knem )
@@ -135,7 +136,7 @@ multilib_src_configure() {
        ECONF_SOURCE=${S} econf "${myconf[@]}" \
                $(use_enable cxx mpi-cxx) \
                $(use_with cma) \
-               $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+               $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
                $(use_enable romio io-romio) \
                $(use_enable heterogeneous) \
                $(use_enable ipv6) \