aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik (Xarthisius) <xarthisius@gentoo.org>2011-08-14 11:46:31 +0200
committerKacper Kowalik (Xarthisius) <xarthisius@gentoo.org>2011-08-14 11:46:31 +0200
commitcef4a93ada7063c58f6d026c73342e97c3966a07 (patch)
treec23dcb9f5ee55da2ba147541c6f1f8c237591442 /sys-cluster
parentUpdate use.local.desc (diff)
downloadsci-cef4a93ada7063c58f6d026c73342e97c3966a07.tar.gz
sci-cef4a93ada7063c58f6d026c73342e97c3966a07.tar.bz2
sci-cef4a93ada7063c58f6d026c73342e97c3966a07.zip
[sys-cluster/openmpi] Add slurm support by Nicolas Bigaouette <nbigaouette@gmail.com>
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/openmpi/ChangeLog3
-rw-r--r--sys-cluster/openmpi/Manifest14
-rw-r--r--sys-cluster/openmpi/openmpi-1.5.3.ebuild17
3 files changed, 15 insertions, 19 deletions
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 8224a9205..3b69a846e 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> openmpi-1.5.3.ebuild:
+ Add slurm support by Nicolas Bigaouette <nbigaouette@gmail.com>
+
21 Jun 2011; Justin Lecher <jlec@gentoo.org> openmpi-1.5.3.ebuild:
Added fortran-2.eclass support
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 2fa2d00aa..388e2f10e 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX eselect.mpi.openmpi 225 RMD160 cf81165864aaad2833f7a8300c20376210a575dd SHA1 8b50b90346b52b831a59ec0abd8e3dbebad2b94e SHA256 df4d363e9fbab74c234b75f426b7f38ef83d16da2b099222c0dde4a2c3ece687
AUX openmpi-r24328.patch 1707 RMD160 4db5f60d692268e1e42ebbc5379cec245b14daa5 SHA1 25a3ac77307b4681e3f917e61ff88daa58dab508 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83
DIST openmpi-1.5.3.tar.bz2 7589097 RMD160 c1d0950c9a5c53c8543838adadf6a7477abe3989 SHA1 669565c708deab82ad4069d82675b2020eb0e0c6 SHA256 70745806cdbe9b945d47d9fa058f99e072328e41e40c0ced6dd75220885c5263
-EBUILD openmpi-1.5.3.ebuild 3085 RMD160 d009491b1fd14c6c02bbbcf8d511ba393e501ed9 SHA1 5c99d8a3ae9f3a53a40ea273445641c37c1dab81 SHA256 6b5451c54c26e829e54d6891f965cd328fceb25c4feaad1d5875066ee2ff32a3
-MISC ChangeLog 4220 RMD160 d0b11190f1952e8637c2b78f03ac3feb341ff8ca SHA1 cdcfcb71df57204a1d2389240185ee9dce61ba93 SHA256 c6feb34229728e5a1e6fbdbe0df315b299dd1177bceced4f988146871d0e476c
+EBUILD openmpi-1.5.3.ebuild 3169 RMD160 437c56e955571e912d72d4f5ccc1161e48c57669 SHA1 c28a06db7df212422561daeb223a1e088695a235 SHA256 4086f75462ba78467f3236763b3ea11698f1281f294171d61b02fcad9162133b
+MISC ChangeLog 4363 RMD160 d09c47d2e911672dafc900c9c8660ecc1a82ded3 SHA1 d9967edfb9eee27a92556f5df91638124e4c66a0 SHA256 65eda5f29444bbfa0229b0233a74caf9685b79465f475168d85716bce92a3dc8
MISC metadata.xml 656 RMD160 223aeb0c645345a35fc674e30cc9f17d936db762 SHA1 f0af00a84589ada70477d0fa12afe21c57a16071 SHA256 809b9f410e784da55e240612ca9542e718f25f65819acda4b3429b22114619e6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4EucUACgkQgAnW8HDreRZfzgCgtNgpb3Hzg21shzmGCBv9c1J7
-2EAAn2iP3elThV2LJH3WTz1clij8Ctka
-=a9w7
------END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.5.3.ebuild b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
index b69bc6b6d..6e124ae98 100644
--- a/sys-cluster/openmpi/openmpi-1.5.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $
-EAPI=3
+EAPI=4
inherit eutils flag-o-matic fortran-2 mpi multilib toolchain-funcs
MY_P=${P/-mpi}
@@ -14,18 +14,21 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v1.5/downloads/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads pbs romio threads vt"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads pbs romio slurm threads vt"
MPI_UNCLASSED_DEP_STR="
vt? (
!dev-libs/libotf
!app-text/lcdf-typetools
)"
RDEPEND="pbs? ( sys-cluster/torque )
- infiniband? ( sys-infiniband/libibverbs )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- >=sys-apps/hwloc-1.1.1
- $(mpi_imp_deplist)"
+ slurm? ( sys-cluster/slurm )
+ infiniband? ( sys-infiniband/libibverbs )
+ elibc_FreeBSD? ( dev-libs/libexecinfo )
+ >=sys-apps/hwloc-1.1.1
+ $(mpi_imp_deplist)"
DEPEND="${RDEPEND}"
+REQUIRED_USE="pbs? ( !slurm )
+ slurm? ( !pbs )"
pkg_setup() {
fortran-2_pkg_setup
@@ -67,7 +70,6 @@ src_configure() {
--sysconfdir="${EPREFIX}/etc/${PN}"
--enable-pretty-print-stacktrace
--enable-orterun-prefix-by-default
- --without-slurm
--with-hwloc=/usr
)
@@ -94,6 +96,7 @@ src_configure() {
$(use_enable romio io-romio) \
$(use_enable heterogeneous) \
$(use_with pbs tm) \
+ $(use_with slurm) \
$(use_enable ipv6) \
$(use_with infiniband openib)
}