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/mpich/
Date: Mon, 29 Aug 2016 20:45:25
Message-Id: 1472496383.a40fade4c2eb4f40309b042d43b8f25659dfdf09.jsbronder@gentoo
1 commit: a40fade4c2eb4f40309b042d43b8f25659dfdf09
2 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 29 18:45:01 2016 +0000
4 Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 29 18:46:23 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a40fade4
7
8 sys-cluster/mpich: add forgotten mpi_root
9
10 Package-Manager: portage-2.2.28
11
12 sys-cluster/mpich/mpich-3.2-r2.ebuild | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
16 index 7f5dcf7..d66b32d 100644
17 --- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
18 +++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
19 @@ -89,18 +89,18 @@ 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}"usr/include/*.mod "${T}"/fortran || die
25 + mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
26 + mv "${ED}"/$(mpi_root)/usr/include/*.mod "${T}"/fortran || die
27 else
28 # some fortran files get installed unconditionally
29 - rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die
30 + rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/include/*.mod || die
31 fi
32 }
33
34 multilib_src_install_all() {
35 # fortran header cannot be wrapped (bug #540508), workaround part 2
36 if use fortran; then
37 - mv "${T}"/fortran/* "${ED}"usr/include || die
38 + mv "${T}"/fortran/* "${ED}"/$(mpi_root)/usr/include || die
39 fi
40
41 mpi_dodir /usr/share/doc/${PF}