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 7A4641381F3 for ; Tue, 2 Jul 2013 00:09:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D69F0E0B96; Tue, 2 Jul 2013 00:09:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CB09E0B96 for ; Tue, 2 Jul 2013 00:09:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 709DE33E721 for ; Tue, 2 Jul 2013 00:09:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BBCDFE5460 for ; Tue, 2 Jul 2013 00:09:44 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1372723751.3114d456f07f612f87dfd403ab120819e913fcce.jsbronder@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/mpi.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: 3114d456f07f612f87dfd403ab120819e913fcce X-VCS-Branch: master Date: Tue, 2 Jul 2013 00:09:44 +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: d2520022-c49c-44de-a27b-80c6316c89b2 X-Archives-Hash: b539b607d45d8308a3497e311e251779 commit: 3114d456f07f612f87dfd403ab120819e913fcce Author: Justin Bronder gentoo org> AuthorDate: Tue Jul 2 00:09:11 2013 +0000 Commit: Justin Bronder gentoo 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 }