[gentoo-commits] proj/sci:master commit in: eclass/

[Justin Bronder]

commit:     3114d456f07f612f87dfd403ab120819e913fcce
Author:     Justin Bronder <jbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  2 00:09:11 2013 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 00:09:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3114d456

workaround OpenMPI build issue #462602

export FAKEROOTKEY=1 to stop OpenMPI from replacing malloc.

---
 eclass/mpi.eclass | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eclass/mpi.eclass b/eclass/mpi.eclass
index b411ae9..76addae 100644
--- a/eclass/mpi.eclass
+++ b/eclass/mpi.eclass
@@ -10,6 +10,7 @@ inherit multilib
 # @BLURB:  Common functions for mpi-pkg.eclass and mpi-imp.eclass
 
 # History:
+#   2013-07-01 (jsbronder):  Workaround OpenMPI build issue #462602
 #	2009-06-26 (jsbronder):  Add ability to require common use flags.
 #		Remove dep on eselect-mpi (it's in sys-cluster/empi)
 #		Use virtual/$class to get imp dep in mpi_pkg_deplist.
@@ -398,6 +399,10 @@ mpi_pkg_set_env() {
 		export FC=$(mpi_pkg_fc)
 		export PKG_CONFIG_PATH="$(mpi_root)$(get_libdir)/pkgconfig:${PKG_CONFIG_PATH}"
 		mpi_pkg_set_ld_library_path
+
+		if [ "$(mpi_pkg_base_imp)" == "openmpi" ]; then
+			export FAKEROOTKEY=1
+		fi
 	fi
 }
 
@@ -412,6 +417,10 @@ mpi_pkg_restore_env() {
 		export FC=$_mpi_oFC
 		export PKG_CONFIG_PATH=$_mpi_oPCP
 		export LD_LIBRARY_PATH=$_mpi_oLLP
+
+		if [ "$(mpi_pkg_base_imp)" == "openmpi" ]; then
+			unset FAKEROOTKEY
+		fi
 	fi
 }