Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/openmpi/
Date: Sat, 03 Apr 2021 15:44:49
Message-Id: 1617464637.b04baf10c2982ecdb205e1f32d9b05ecb8e7fa67.sam@gentoo
1 commit: b04baf10c2982ecdb205e1f32d9b05ecb8e7fa67
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 2 06:08:26 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 3 15:43:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b04baf10
7
8 sys-cluster/openmpi: fix variable references
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild | 8 +++++---
13 1 file changed, 5 insertions(+), 3 deletions(-)
14
15 diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
16 index c5a6122cbd9..2a01a1f2fb3 100644
17 --- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
18 +++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2020 Gentoo Authors
21 +# Copyright 1999-2021 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=7
25 @@ -9,7 +9,7 @@ inherit autotools cuda flag-o-matic fortran-2 toolchain-funcs
26
27 MY_P=${P/-mpi}
28
29 -S=${WORKDIR}/${MY_P}
30 +S="${WORKDIR}"/${MY_P}
31
32 IUSE_OPENMPI_FABRICS="
33 openmpi_fabrics_ofed
34 @@ -131,7 +131,7 @@ src_configure() {
35 econf "${myconf[@]}" \
36 $(use_enable cxx mpi-cxx) \
37 $(use_with cma) \
38 - $(use_with cuda cuda "$EPREFIX"/opt/cuda) \
39 + $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
40 $(use_enable romio io-romio) \
41 $(use_enable heterogeneous) \
42 $(use_enable ipv6) \
43 @@ -149,8 +149,10 @@ src_configure() {
44
45 src_install() {
46 default
47 +
48 # From USE=vt see #359917
49 rm "${ED}"/usr/share/libtool || die
50 +
51 # Avoid collisions with libevent
52 rm -rf "${ED}"/usr/include/event2 || die
53 dodoc README AUTHORS NEWS VERSION