commit: 4c8095d969a8fef206270703f8571ec6dd36513f Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> AuthorDate: Sat Feb 21 02:45:46 2015 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> 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 <[email protected]> mpich-3.1.3-r1.ebuild: + added fortran hack for bug #540508 + 20 Feb 2015; Christoph Junghans <[email protected]> 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
