Gentoo Archives: gentoo-commits

From: Justin Bronder <jsbronder@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: eclass/
Date: Tue, 02 Jul 2013 02:15:55
Message-Id: 1372731330.ad77dd63122d96dda3aaa2eb43e035b471923de1.jsbronder@gentoo
1 commit: ad77dd63122d96dda3aaa2eb43e035b471923de1
2 Author: Justin Bronder <jbronder <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 2 02:15:30 2013 +0000
4 Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 2 02:15:30 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ad77dd63
7
8 Revert "workaround OpenMPI build issue #462602"
9
10 This reverts commit 3114d456f07f612f87dfd403ab120819e913fcce.
11
12 ---
13 eclass/mpi.eclass | 9 ---------
14 1 file changed, 9 deletions(-)
15
16 diff --git a/eclass/mpi.eclass b/eclass/mpi.eclass
17 index 76addae..b411ae9 100644
18 --- a/eclass/mpi.eclass
19 +++ b/eclass/mpi.eclass
20 @@ -10,7 +10,6 @@ inherit multilib
21 # @BLURB: Common functions for mpi-pkg.eclass and mpi-imp.eclass
22
23 # History:
24 -# 2013-07-01 (jsbronder): Workaround OpenMPI build issue #462602
25 # 2009-06-26 (jsbronder): Add ability to require common use flags.
26 # Remove dep on eselect-mpi (it's in sys-cluster/empi)
27 # Use virtual/$class to get imp dep in mpi_pkg_deplist.
28 @@ -399,10 +398,6 @@ mpi_pkg_set_env() {
29 export FC=$(mpi_pkg_fc)
30 export PKG_CONFIG_PATH="$(mpi_root)$(get_libdir)/pkgconfig:${PKG_CONFIG_PATH}"
31 mpi_pkg_set_ld_library_path
32 -
33 - if [ "$(mpi_pkg_base_imp)" == "openmpi" ]; then
34 - export FAKEROOTKEY=1
35 - fi
36 fi
37 }
38
39 @@ -417,10 +412,6 @@ mpi_pkg_restore_env() {
40 export FC=$_mpi_oFC
41 export PKG_CONFIG_PATH=$_mpi_oPCP
42 export LD_LIBRARY_PATH=$_mpi_oLLP
43 -
44 - if [ "$(mpi_pkg_base_imp)" == "openmpi" ]; then
45 - unset FAKEROOTKEY
46 - fi
47 fi
48 }