[gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/

["Christoph Junghans" <ottxor@gentoo.org>]

commit:     e3636e5fd50334e2319f42059a2ff8d72610db20
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 16:55:45 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 16:55:45 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3636e5f

added fortran hack for bug #540508

Package-Manager: portage-2.2.14

---
 sys-cluster/openmpi/ChangeLog               |  3 +++
 sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 99406f7..ba79a0b 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Feb 2015; Christoph Junghans <ottxor@gentoo.org> openmpi-1.8.4-r3.ebuild:
+  added fortran hack for bug #540508
+
 *openmpi-1.8.4-r3 (19 Feb 2015)
 
   19 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +openmpi-1.8.4-r3.ebuild,

diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
index 7822097..306bede 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r3.ebuild
@@ -75,14 +75,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpif-io-handles.h
-	/usr/include/mpif-constants.h
 	/usr/include/mpi.h
-	/usr/include/mpif-externals.h
-	/usr/include/mpif-io-constants.h
-	/usr/include/mpif-config.h
-	/usr/include/mpif-sentinels.h
-	/usr/include/mpif-handles.h
 )
 
 pkg_setup() {
@@ -165,12 +158,23 @@ multilib_src_install() {
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete
+
+	# 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
+	fi
 }
 
 multilib_src_install_all() {
 	# From USE=vt see #359917
 	rm "${ED}"/usr/share/libtool &> /dev/null
 
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+	fi
+
 	# Avoid collisions with libevent
 	rm -rf "${ED}"/usr/include/event2 &> /dev/null