Gentoo Archives: gentoo-commits

From: Justin Bronder <jsbronder@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/
Date: Mon, 29 Aug 2016 20:45:25
Message-Id: 1472496372.91299b30842d08569330de9cacca21294db759b7.jsbronder@gentoo
1 commit: 91299b30842d08569330de9cacca21294db759b7
2 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 29 18:39:37 2016 +0000
4 Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 29 18:46:12 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=91299b30
7
8 sys-cluster/openmpi: add forgotten mpi_root
9
10 Package-Manager: portage-2.2.28
11
12 sys-cluster/openmpi/openmpi-1.10.3-r2.ebuild | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/sys-cluster/openmpi/openmpi-1.10.3-r2.ebuild b/sys-cluster/openmpi/openmpi-1.10.3-r2.ebuild
16 index 6042f1a..1e4278c 100644
17 --- a/sys-cluster/openmpi/openmpi-1.10.3-r2.ebuild
18 +++ b/sys-cluster/openmpi/openmpi-1.10.3-r2.ebuild
19 @@ -158,10 +158,10 @@ multilib_src_install() {
20 # fortran header cannot be wrapped (bug #540508), workaround part 1
21 if multilib_is_native_abi && use fortran; then
22 mkdir "${T}"/fortran || die
23 - mv "${ED}"usr/include/mpif* "${T}"/fortran || die
24 + mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
25 else
26 # some fortran files get installed unconditionally
27 - rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
28 + rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/bin/mpif* || die
29 fi
30 }
31
32 @@ -171,7 +171,7 @@ multilib_src_install_all() {
33
34 # fortran header cannot be wrapped (bug #540508), workaround part 2
35 if use fortran; then
36 - mv "${T}"/fortran/mpif* "${ED}"usr/include || die
37 + mv "${T}"/fortran/mpif* "${ED}"/$(mpi_root)/usr/include || die
38 fi
39
40 # Avoid collisions with libevent