commit: b04baf10c2982ecdb205e1f32d9b05ecb8e7fa67
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 2 06:08:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 15:43:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04baf10
sys-cluster/openmpi: fix variable references
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index c5a6122cbd9..2a01a1f2fb3 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ inherit autotools cuda flag-o-matic fortran-2 toolchain-funcs
MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
IUSE_OPENMPI_FABRICS="
openmpi_fabrics_ofed
@@ -131,7 +131,7 @@ src_configure() {
econf "${myconf[@]}" \
$(use_enable cxx mpi-cxx) \
$(use_with cma) \
- $(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) \
@@ -149,8 +149,10 @@ src_configure() {
src_install() {
default
+
# From USE=vt see #359917
rm "${ED}"/usr/share/libtool || die
+
# Avoid collisions with libevent
rm -rf "${ED}"/usr/include/event2 || die
dodoc README AUTHORS NEWS VERSION
