Clean up the misleading usage of USE=threads by separating the safe and experimental portions. See #237435. Thanks to kyron (Eric Thibodeau) for the report and patch.

Package-Manager: portage-2.1.4.4

4 files changed, 124 insertions, 6 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 44d5331e4fa6..ec304252fde6 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.32 2008/07/28 20:46:59 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.33 2008/09/12 14:34:02 jsbronder Exp $
+
+*openmpi-1.2.7-r1 (12 Sep 2008)
+
+  12 Sep 2008; Justin Bronder <jsbronder@gentoo.org> metadata.xml,
+  +openmpi-1.2.7-r1.ebuild:
+  Clean up the misleading usage of USE=threads by separating the safe and
+  experimental portions.  See #237435.  Thanks to kyron (Eric Thibodeau) for the
+  report and patch.
 
   28 Jul 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml:
   Update metadata.xml to include USE flag descriptions. Entries taken from
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 7e63d7dfe143..9ee01fdd1820 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -7,13 +7,14 @@ DIST openmpi-1.2.7.tar.bz2 3555597 RMD160 6707fba2f2de240c25f6135cd37bb42eb78c65
 EBUILD openmpi-1.2.5.ebuild 2404 RMD160 b1b34826f7642556f67e98ce8e82b195906074c3 SHA1 cfbb569fc286eb43433193879608c36f87b1c6b9 SHA256 c6f8211413d9cfb9914fbc81fb1be5bcf6b118297adc152fa8f63fbcb0120a08
 EBUILD openmpi-1.2.6-r1.ebuild 2532 RMD160 0d0e7f85c7764797d8bded07e2d1fb91a8a6858b SHA1 c74630f95029072d564762d65bfffb8b6043e67d SHA256 301f428d8e5de3a07dc43c186e83b1ff0c03e2a0988f53f84494617f8e4cc24b
 EBUILD openmpi-1.2.6.ebuild 2570 RMD160 80f78f33a907315027b97273d7a15aec68555d00 SHA1 963703fbe9a106cc1d623c92a7b0d04b1d934ff3 SHA256 54c7a8b9d796ec143f161bd552fe6536b555fb72499f11c2a937fb486d39f5c7
+EBUILD openmpi-1.2.7-r1.ebuild 2832 RMD160 2e838c9a73515ab68a885fa115c7b5291e0fcae6 SHA1 7101a7fa7e99ea4b77e7b0cbf33ac9259c3c2ff0 SHA256 19156b2f274054eb39ad9033565d8eca63648a3aab48481029ca60f66e58f9c1
 EBUILD openmpi-1.2.7.ebuild 2538 RMD160 5b65879d49567e077f27be658230ec495b8ee932 SHA1 6ef700d47661b294aecee9db4d756172fdbd537d SHA256 f3526c4b8550cd48e8dd0837284f0f565e3ee8d5250085aa0ea74601bb3eb0fc
-MISC ChangeLog 5700 RMD160 917f75922e703e5c88409be777ea934e1b488c69 SHA1 5a3c8583289d73fed1b345bea1b0491014dd32b4 SHA256 e1abd76ec7f56798a90098c6923d465d840c197e7aca57575b11ccf7388bbdf1
-MISC metadata.xml 589 RMD160 c1b05c7c7df9273ea6354fc46536212caa15757c SHA1 67f4d1bcedf14923622b841650d8c9dd04461c63 SHA256 9f85bd8ab961bc5ae03a79c40dc41f885608073e3661e21c126b47e18de868c3
+MISC ChangeLog 6006 RMD160 990be148135eb8e5fef4ca2625b83b11acc0ac9c SHA1 2787e7cbc4958ec09e152ee0fe4878a9f7d344c2 SHA256 b9856138555be943452dc0c2ab1cf9a879164201254a1662b2d37811d96bb4ab
+MISC metadata.xml 650 RMD160 47b824c01aaf9426efa9cdaeaf27bab9ac823175 SHA1 6a616cad20809f8aefd8fe6a15ffda2f69ff4b84 SHA256 dd00aa7a740c3870288e1365c9a770f295136435ed710928ba45c4cd3a624c0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki6/ScACgkQ4MrvBE1wQ8mfdwCfQU1jmEseYscp62m7h1nyZNqh
-CfQAn0OkS1b1d6uC0rjfDO2PNvKrzlKa
-=k4EN
+iEYEARECAAYFAkjKfeAACgkQ4MrvBE1wQ8nJdwCgsQtuv/0CSjdxoAwsCZsoumcQ
+pncAn0NTtZtG+Mq5oq/j8IKHh4X6aUAO
+=c4B5
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index c082e92a5a4a..0e87e388c80a 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
 		<flag name='smp'>Enable smp locks in atomic ops.  Recommended for
 		SMP/multi-threaded environments.</flag>
+		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-1.2.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..27c31558dc47
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.2.7-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.7-r1.ebuild,v 1.1 2008/09/12 14:34:02 jsbronder Exp $
+
+inherit eutils multilib flag-o-matic toolchain-funcs fortran
+
+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.2/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+RESTRICT="mpi-threads? ( test )"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fortran heterogeneous ipv6 mpi-threads nocxx pbs romio threads"
+RDEPEND="pbs? ( sys-cluster/torque )
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use mpi-threads; then
+		ewarn
+		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"
+		ewarn
+		epause 5
+	fi
+
+	elog
+	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."
+	elog
+
+	if use fortran; then
+		FORTRAN="g77 gfortran ifc"
+		fortran_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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
+}
+
+src_compile() {
+	local myconf="
+		--sysconfdir=/etc/${PN}
+		--without-xgrid
+		--enable-pretty-print-stacktrace
+		--enable-orterun-prefix-by-default
+		--without-slurm"
+
+	if use mpi-threads; then
+		myconf="${myconf}
+			--enable-mpi-threads
+			--with-progress-threads"
+	fi
+
+	if use fortran; then
+		if [[ "${FORTRANC}" = "g77" ]]; then
+			myconf="${myconf} --disable-mpi-f90"
+		elif [[ "${FORTRANC}" = "gfortran" ]]; then
+			# Because that's just a pain in the butt.
+			myconf="${myconf} --with-wrapper-fflags=-I/usr/include"
+		elif [[ "${FORTRANC}" = if* ]]; then
+			# Enabled here as gfortran compile times are huge with this enabled.
+			myconf="${myconf} --with-mpi-f90-size=medium"
+		fi
+	else
+		myconf="${myconf}
+			--disable-mpi-f90
+			--disable-mpi-f77"
+	fi
+
+	econf ${myconf} \
+		$(use_enable !nocxx mpi-cxx) \
+		$(use_enable romio io-romio) \
+		$(use_enable heterogeneous) \
+		$(use_with pbs tm) \
+		$(use_enable ipv6) \
+	|| die "econf failed"
+
+	emake  || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README AUTHORS NEWS VERSION
+}
+
+src_test() {
+	# Doesn't work with the default src_test as the dry run (-n) fails.
+	cd "${S}"
+	emake -j1 check || die "emake check failed"
+}