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

[Justin Bronder]

commit:     9b561f5c757362a404c9a7505b7344602a649ad3
Author:     Jian Cao <sworden.cao <AT> gmail <DOT> com>
AuthorDate: Thu Apr  4 20:46:56 2019 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 21:56:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9b561f5c

sys-cluster/openmpi: specify external libraries and version bump

Closes: https://bugs.gentoo.org/671510
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jian Cao <sworden.cao <AT> gmail.com>
Signed-off-by: Justin Bronder <jsbronder <AT> gentoo.org>

 sys-cluster/openmpi/{openmpi-4.0.0.ebuild => openmpi-4.0.1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/openmpi/openmpi-4.0.0.ebuild b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
similarity index 97%
rename from sys-cluster/openmpi/openmpi-4.0.0.ebuild
rename to sys-cluster/openmpi/openmpi-4.0.1.ebuild
index 5fd6e1b85..670d49012 100644
--- a/sys-cluster/openmpi/openmpi-4.0.0.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal mpi
+inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal mpi
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -106,8 +106,10 @@ multilib_src_configure() {
 		--enable-pretty-print-stacktrace \
 		--enable-orterun-prefix-by-default \
 		--with-hwloc="${EPREFIX}/usr" \
+		--with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--with-libltdl="${EPREFIX}/usr" \
 		--with-libevent="${EPREFIX}/usr" \
+		--with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--enable-mpi-fortran=$(usex fortran all no) \
 		$(use_enable cxx mpi-cxx) \
 		$(use_with cma) \
@@ -144,8 +146,6 @@ multilib_src_install() {
 		rm \
 			"${ED}"/$(mpi_root)/usr/include/mpif* \
 			"${ED}"/$(mpi_root)/usr/bin/mpif* \
-			"${ED}"/$(mpi_root)/usr/bin/oshfort \
-			"${ED}"/$(mpi_root)/usr/bin/shmemfort \
 			|| die
 	fi
 }