Add some prefix related fixes for openmpi

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 146 insertions, 16 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 18a7e2ae0f6d..bfad032a2f07 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.92 2011/08/31 17:26:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.93 2011/12/17 12:52:12 alexxy Exp $
+
+*openmpi-1.5.4-r1 (17 Dec 2011)
+
+  17 Dec 2011; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.5.4-r1.ebuild:
+  Add some prefix related fixes
 
   31 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.5.4.ebuild:
   Version bump
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 7c4a068e7a37..71a4becfd410 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -12,23 +12,24 @@ EBUILD openmpi-1.4.3.ebuild 2744 RMD160 02938b75b03428624d1164872db274dd75ede792
 EBUILD openmpi-1.5.3-r1.ebuild 3038 RMD160 27c44dd4cf4e18caf3e9bec1bab08b92dab68ec9 SHA1 31d2084063e966a8691b2d996a2de0a737f87da0 SHA256 bc5297bb77d8e34bbccfd8a6c66d3aec43db68cff505e76771eff5995c3bf212
 EBUILD openmpi-1.5.3-r2.ebuild 3150 RMD160 e1c86d7768a03d6b8bc41179c57be490018fefc7 SHA1 a96868b3c815c0b532f097c09e97534d96e84427 SHA256 82758c65eae163f21bb7a1ef77deaa2aea3c45c86078d79b7589780b8131f90d
 EBUILD openmpi-1.5.3.ebuild 2866 RMD160 05ea9a199fdebbea163219e59a286c45f7385308 SHA1 ccdddf8f49328cedc1a5f58fcda8e568cb5ca52e SHA256 aabfd0213c13ce3eecb45bd6eaafc25a777cf8e9470b36609208716453adcaec
+EBUILD openmpi-1.5.4-r1.ebuild 3281 RMD160 cc6f272a1148358211a58b26f3c8ec7ad3aee38c SHA1 bb246d3726c0e37703ad05079af751f3b61f0bb5 SHA256 113b55e3c4cfb976d7828c01b60fa4306a9aba608212e99ff22645925ab44cbe
 EBUILD openmpi-1.5.4.ebuild 3163 RMD160 08ef9dff9ca9b6841f4e169873dd44b34fd66ca0 SHA1 f7914d3af94e2a9db11e9a99eefbb26a3a55f679 SHA256 c0ac7ea59a092908aaaa858879ac9fc29087796f7e9faf61a48b50902a46f1f0
-MISC ChangeLog 13885 RMD160 dd5d72ff47dbbd5551272cb93779624b667542da SHA1 7b3a904c61f905fa4f7e1285180ad01c209b6694 SHA256 bd64c285e9807f4dcf6492ec6293d65dc4efb4447f52be2f9657414ef02cd62b
-MISC metadata.xml 694 RMD160 426659426d5466df5a01f809fa25a9736908358d SHA1 46f709ae3e6e046e5f2db69e00455291c486380c SHA256 ed1283fc3e7bbb2a52e2e1444cf7f9c9bffb71df9d78ce551110efa80babc072
+MISC ChangeLog 14028 RMD160 de132d6c3b8641e6a87b106746eaaadfc10cbcea SHA1 f0277d42ba1afd85a0ec5261385d54d1973d2987 SHA256 3c7784aa56011200d5c264902d329dc5a7d753ee1773ec22b5a782f00182cc8e
+MISC metadata.xml 759 RMD160 caf718d3ef2cc604224ac3cdc22f5baefe782ef3 SHA1 76edf4e288621c70d3208c9684ab5f0726a99103 SHA256 fd1a5b65afaa1cc9edf9a8ac9fb7832276dac47bdc4a4109f3e49cdce91d8b1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOXm6iAAoJEOf+E+/4L5LmmuYP/iNihqHpVHahssjdKzmqMxIc
-pFAcPfU9hLmOB/nOdjZ34jS57gQY/LUBJNnN+OZWV4c50ZPozurSceTYjrqL1oXL
-a73rBHp6+Ns7+yWx60+XtZ0DYKcRnPwtXD08kqhF6ekrKephVo+c8QabCxJ6n1on
-mdFv+/acI3eSwmBU39VrR9Zsi3xOCfmmlpHfzoUb9E8Onf07DL0AzOoobVDXDI1Y
-ue/GNOBOAm7TvaucP5qvy9ZPrjcRYEDzJk6b/EywkEspl1XUIylmsvMvfI8XkFZA
-eF5CpHmDKnpc2PIlaZxyVw08nvHY0tufw89b8uYOeJHjkyDVgoWl0E28jma8o2XG
-XLt0c/BoIeBOqv/78Wd+ht9gYMiDSU1bW9CaEMlUIu10dXxzaM6jaUIh+E8C6DAY
-iyQ+c+pc9nimbbih7djfp2C+DUuHI26n0/9PeYNFWAyATsPqlkYQmAeCohnoNQn1
-3akO1UO8bMT+taRLddXTHXICsCgv7I+ooVWZDjIOK+1SdSH8WGP5g+aXFC/K5Im4
-dQY6qbM1hcjjgJp5yKnyZE9Wi1aqwjFlKZmgHJnVQKmkcTfQm+F9WIX29H9GM5qz
-V3FYEEdNh2uE4BcParCWB3CKW9iaVq5a6QYMGIZKubKKCXNiv8o6YE/KGLTe7eqt
-MhOambMbMdiO1f8BlX7F
-=h5cm
+iQIcBAEBCAAGBQJO7JByAAoJEOf+E+/4L5LmOx0QAIxvpIGYVAumCq0M1KXO4thM
+tTGiMNXdt194okpOU8RTKX7oC3x1lllWG9QoC6kg0la7MxagiybvVyc1Nupf7R4w
+IVXk6+yhfmV5ik6DlKUTDE+77tHy+VGiiVPp8kl8lTwDi08uBFG8lXTkgeUEFdgh
+6fynZuXhuFM1F06pMai9VuNGTBo0BH+dj37plHyspBthPJDiN8ZHFBb9k/j+TpQo
+z/mNRATzMtBXM7lGwNw5c0/2amigDGT9kJjejsPDvZP3hJdGhrrHd9EugZDf+K3R
+J6vICpc+K7GeFk7/xHuPxRpywpsYjfTOAkgLvsM3gcNrLaKxoXUEzOXMogAXAfsz
+VufU/aFkvxfxVnqno17YnhjCPseO28zwTkUV7IGmIALuZZSQNY4nR6g0Y0/ASbWP
+uNY0oFp6ANZLenqTQYicg2Pb5VHKxeuYHAyVyzX6yy5nnBqfHTsSi6hCYgDUXWmC
+vS90ELmN0I1lnk155e9IskiF27Guqx01GW4xktf4UKLY5S0zwmivAXoOz4MAYOOz
+8X9rwMZanBN1zoIEIND3u9OsLUzHXH59ND4HhZ1r/89RnvoZ8OMFpK7EejTGarjl
+zps0pHixOH7jl4nZ6DVb01k6MjUv2wdxYFEmCgS8w4TcaTwuweE/7trAfFP37G+F
+vCxyg7pNFXsYUfu1rkzk
+=S79g
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index 6e57dc7c39a8..5455cf790366 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name='pbs'>Add support for the Portable Batch System (PBS)</flag>
 		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
 		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
+		<flag name='numa'>Enable numa memory allocation support</flag>
 		<flag name='sctp'>Enable SCTP support</flag>
 		<flag name='slurm'>Add support for SLURM</flag>
 		<flag name='vt'>Enable bundled VampirTrace support</flag>
diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r1.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..8c5bf352a97b
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.5.4-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r1.ebuild,v 1.1 2011/12/17 12:52:12 alexxy Exp $
+
+EAPI=4
+inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v1.5/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous infiniband ipv6 mpi-threads +numa pbs
+	romio sctp slurm threads vt"
+
+REQUIRED_USE="^^ (
+					( !slurm !pbs )
+					( slurm !pbs )
+					( !slurm pbs )
+				)"
+
+RDEPEND="
+	fortran? ( virtual/fortran )
+	pbs? ( sys-cluster/torque )
+	infiniband? ( sys-infiniband/openib )
+	sctp? ( net-misc/lksctp-tools )
+	vt? (
+		!dev-libs/libotf
+		!app-text/lcdf-typetools
+	)
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	numa? ( sys-process/numactl )
+	>=sys-apps/hwloc-1.3
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2
+	!sys-cluster/mpiexec"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	if use mpi-threads; then
+		echo
+		ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
+		ewarn "default and officially unsupported by upstream."
+		ewarn "You may stop now and set USE=-mpi-threads"
+		echo
+	fi
+
+	echo
+	elog "OpenMPI has an overwhelming count of configuration options."
+	elog "Don't forget the EXTRA_ECONF environment variable can let you"
+	elog "specify configure options if you find them necessary."
+	echo
+}
+
+src_prepare() {
+	# Necessary for scalibility, see
+	# http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+	if use threads; then
+		echo 'oob_tcp_listen_mode = listen_thread' \
+			>> opal/etc/openmpi-mca-params.conf
+	fi
+
+	epatch "${FILESDIR}"/openmpi-r24328.patch
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--enable-pretty-print-stacktrace
+		--enable-orterun-prefix-by-default
+		--with-hwloc="${EPREFIX}/usr"
+		)
+
+	if use mpi-threads; then
+		myconf+=(
+			--enable-mpi-thread-multiple
+			--enable-opal-multi-threads
+			)
+	fi
+
+	if use fortran; then
+		if [[ $(tc-getFC) =~ g77 ]]; then
+			myconf+=(--disable-mpi-f90)
+		elif [[ $(tc-getFC) =~ if ]]; then
+			# Enabled here as gfortran compile times are huge with this enabled.
+			myconf+=( --with-mpi-f90-size=medium )
+		fi
+	else
+		myconf+=( --disable-mpi-f90 --disable-mpi-f77 )
+	fi
+
+	! use vt && myconf+=(--enable-contrib-no-build=vt)
+
+	use infiniband && myconf+=( --with-openib="${EPREFIX}/usr"  )
+	use numa && myconf+=( --with-libnuma="${EPREFIX}/usr" )
+
+	econf "${myconf[@]}" \
+		$(use_enable cxx mpi-cxx) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_with pbs tm) \
+		$(use_with slurm) \
+		$(use_enable ipv6) \
+		$(use_with sctp sctp)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	# From USE=vt see #359917
+	rm "${D}"/usr/share/libtool &> /dev/null
+	dodoc README AUTHORS NEWS VERSION || die
+}
+
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	emake -j1 check || die "emake check failed"
+}