From 18ac817afbb862936e4c4aa3a46d15b7eddd9dae Mon Sep 17 00:00:00 2001 From: Michael Gilroy Date: Wed, 12 Apr 2017 15:14:23 +0000 Subject: [PATCH] sys-cluster/mpich: Fixed multilib_src_install() logic Previously in the case where compiles used -fortran and multilib_is_native_abi was true, the rm would fail and the build would die. The nested conditional prevents this. Bug: #612564 --- sys-cluster/mpich/mpich-3.2-r1.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.2-r1.ebuild index 48ddf87a919fb..f862068a14d84 100644 --- a/sys-cluster/mpich/mpich-3.2-r1.ebuild +++ b/sys-cluster/mpich/mpich-3.2-r1.ebuild @@ -101,13 +101,14 @@ multilib_src_install() { default # fortran header cannot be wrapped (bug #540508), workaround part 1 - if multilib_is_native_abi && use fortran; then - mkdir "${T}"/fortran || die - mv "${ED}"usr/include/mpif* "${T}"/fortran || die - mv "${ED}"usr/include/*.mod "${T}"/fortran || die - else - # some fortran files get installed unconditionally - rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die + if use fortran; then + if multilib_is_native_abi; then + mkdir "${T}"/fortran || die + mv "${ED}"usr/include/mpif* "${T}"/fortran || die + mv "${ED}"usr/include/*.mod "${T}"/fortran || die + else + rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die + fi fi }