1 |
commit: 18ac817afbb862936e4c4aa3a46d15b7eddd9dae |
2 |
Author: Michael Gilroy <michael.gilroy24 <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Apr 12 15:14:23 2017 +0000 |
4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 12 20:42:27 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ac817a |
7 |
|
8 |
sys-cluster/mpich: Fixed multilib_src_install() logic |
9 |
|
10 |
Previously in the case where compiles used -fortran and |
11 |
multilib_is_native_abi was true, the rm would fail and the build would |
12 |
die. The nested conditional prevents this. |
13 |
|
14 |
Bug: #612564 |
15 |
|
16 |
sys-cluster/mpich/mpich-3.2-r1.ebuild | 15 ++++++++------- |
17 |
1 file changed, 8 insertions(+), 7 deletions(-) |
18 |
|
19 |
diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.2-r1.ebuild |
20 |
index 48ddf87a919..f862068a14d 100644 |
21 |
--- a/sys-cluster/mpich/mpich-3.2-r1.ebuild |
22 |
+++ b/sys-cluster/mpich/mpich-3.2-r1.ebuild |
23 |
@@ -101,13 +101,14 @@ multilib_src_install() { |
24 |
default |
25 |
|
26 |
# fortran header cannot be wrapped (bug #540508), workaround part 1 |
27 |
- if multilib_is_native_abi && use fortran; then |
28 |
- mkdir "${T}"/fortran || die |
29 |
- mv "${ED}"usr/include/mpif* "${T}"/fortran || die |
30 |
- mv "${ED}"usr/include/*.mod "${T}"/fortran || die |
31 |
- else |
32 |
- # some fortran files get installed unconditionally |
33 |
- rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die |
34 |
+ if use fortran; then |
35 |
+ if multilib_is_native_abi; then |
36 |
+ mkdir "${T}"/fortran || die |
37 |
+ mv "${ED}"usr/include/mpif* "${T}"/fortran || die |
38 |
+ mv "${ED}"usr/include/*.mod "${T}"/fortran || die |
39 |
+ else |
40 |
+ rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die |
41 |
+ fi |
42 |
fi |
43 |
} |