gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-cluster/mpich: Fixed multilib_src_install() logic

Browse Source 
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
This commit is contained in:
Michael Gilroy
2017-04-12 15:14:23 +00:00
committed by Justin Bronder
parent 482cd8488f
commit 18ac817afb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sys-cluster/mpich/mpich-3.2-r1.ebuild
View File

@@ -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
}