From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AC479138A1A for ; Sat, 21 Feb 2015 02:46:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F09B4E08B1; Sat, 21 Feb 2015 02:46:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 519B4E08AD for ; Sat, 21 Feb 2015 02:46:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71B463408FB for ; Sat, 21 Feb 2015 02:46:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFE2512358 for ; Sat, 21 Feb 2015 02:46:43 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1424486796.4c8095d969a8fef206270703f8571ec6dd36513f.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/mpich/ChangeLog sys-cluster/mpich/mpich-3.1.3-r1.ebuild X-VCS-Directories: sys-cluster/mpich/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 4c8095d969a8fef206270703f8571ec6dd36513f X-VCS-Branch: master Date: Sat, 21 Feb 2015 02:46:43 +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: ab95fd62-c021-443b-b04d-b0c6e25aad52 X-Archives-Hash: d3d449251455d9385bf4de3c165b0a6e commit: 4c8095d969a8fef206270703f8571ec6dd36513f Author: Christoph Junghans gentoo org> AuthorDate: Sat Feb 21 02:45:46 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Sat Feb 21 02:46:36 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4c8095d9 added fortran hack for bug #540508 Package-Manager: portage-2.2.14 --- sys-cluster/mpich/ChangeLog | 3 +++ sys-cluster/mpich/mpich-3.1.3-r1.ebuild | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog index 77d6182..3b7b197 100644 --- a/sys-cluster/mpich/ChangeLog +++ b/sys-cluster/mpich/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Feb 2015; Christoph Junghans mpich-3.1.3-r1.ebuild: + added fortran hack for bug #540508 + 20 Feb 2015; Christoph Junghans mpich-3.1.3-r1.ebuild: disable natvie fortran diff --git a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild index e0797c2..52e1276 100644 --- a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild +++ b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild @@ -36,7 +36,6 @@ S="${WORKDIR}"/${PN}-${MY_PV} MULTILIB_WRAPPED_HEADERS=( /usr/include/mpicxx.h /usr/include/mpi.h - /usr/include/mpif.h /usr/include/opa_config.h ) @@ -107,13 +106,20 @@ multilib_src_test() { multilib_src_install() { default - #fortran modules are arch-specific, follow OpenMPI and put them in lib + # fortran header cannot be wrapped (bug #540508), workaround part 1 if multilib_is_native_abi && use fortran; then - mv "${ED}"/usr/include/*.mod "${ED}"/usr/$(get_libdir) || die + mkdir "${T}"/fortran || die + mv "${ED}"/usr/include/mpif* "${T}"/fortran || die + mv "${ED}"/usr/include/*.mod "${T}"/fortran || die fi } multilib_src_install_all() { + # fortran header cannot be wrapped (bug #540508), workaround part 2 + if use fortran; then + mv "${T}"/fortran/* "${ED}"/usr/include || die + fi + dodir /usr/share/doc/${PF} dodoc README{,.envvar} CHANGES RELEASE_NOTES newdoc src/pm/hydra/README README.hydra