From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A37A7139694 for ; Wed, 12 Apr 2017 20:43:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70458E0CFD; Wed, 12 Apr 2017 20:43:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50994E0CFD for ; Wed, 12 Apr 2017 20:43:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 748D3340F43 for ; Wed, 12 Apr 2017 20:43:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A0C7742A for ; Wed, 12 Apr 2017 20:43:18 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1492029747.18ac817afbb862936e4c4aa3a46d15b7eddd9dae.jsbronder@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpich/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/mpich/mpich-3.2-r1.ebuild X-VCS-Directories: sys-cluster/mpich/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 18ac817afbb862936e4c4aa3a46d15b7eddd9dae X-VCS-Branch: master Date: Wed, 12 Apr 2017 20:43:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d81219df-c5ed-402c-b7d0-3b9a7ababe38 X-Archives-Hash: ed537f429e8e91b35cfa4a4f4ae90ce8 commit: 18ac817afbb862936e4c4aa3a46d15b7eddd9dae Author: Michael Gilroy gmail com> AuthorDate: Wed Apr 12 15:14:23 2017 +0000 Commit: Justin Bronder gentoo org> CommitDate: Wed Apr 12 20:42:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ac817a 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 48ddf87a919..f862068a14d 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 }