Push /usr/include into the default searchpath for mpif90. #281283

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 121 insertions, 5 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 9ef23af451e9..a445d3db5f3b 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.52 2009/08/17 23:53:09 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.53 2009/08/18 00:32:27 jsbronder Exp $
+
+*openmpi-1.2.9-r1 (18 Aug 2009)
+
+  18 Aug 2009; Justin Bronder <jsbronder@gentoo.org>
+  +openmpi-1.2.9-r1.ebuild:
+  Push /usr/include into the default searchpath for mpif90. #281283
 
   17 Aug 2009; Justin Bronder <jsbronder@gentoo.org> openmpi-1.3.3.ebuild:
   Add blocker against app-text/lcdf-typetools when vt is enabled. #281318
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index bbc5cce3a2db..cdc52151c038 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -5,14 +5,15 @@ DIST openmpi-1.2.6.tar.bz2 3556676 RMD160 abb72266e44cb5e3a2450a4936f3744edef77c
 DIST openmpi-1.2.9.tar.bz2 3562494 RMD160 072d9a646345e6438e7b4559e06a210fbc06cae6 SHA1 b383e47799b2c615daa32029b98bb2ca6fe09be2 SHA256 0eb36abe09ba7bf6f7a70255974e5d0a273f7f32d0e23419862c6dcc986f1dff
 DIST openmpi-1.3.3.tar.bz2 6695647 RMD160 209972fdbf52787ea0482d9b89fad2c1f59e6e87 SHA1 f668feb22ff0a4c4d9b438e4e69a97b08aa73234 SHA256 e1425853282da9237f5b41330207e54da1dc803a2e19a93dacc3eca1d083e422
 EBUILD openmpi-1.2.6-r1.ebuild 2532 RMD160 0d0e7f85c7764797d8bded07e2d1fb91a8a6858b SHA1 c74630f95029072d564762d65bfffb8b6043e67d SHA256 301f428d8e5de3a07dc43c186e83b1ff0c03e2a0988f53f84494617f8e4cc24b
+EBUILD openmpi-1.2.9-r1.ebuild 2873 RMD160 55f7cbbdf1195ff0e38c1650cbad012ad94a7cb4 SHA1 8be8cb53e0117e13534fd1fb2047ead7a24de000 SHA256 2415fdbe95179b446171eda0f663cb98eed90768777c67c27760939608a63c44
 EBUILD openmpi-1.2.9.ebuild 2823 RMD160 1b05caedb585b52458228863800e0241f39974eb SHA1 733fcb75b95420ffee67198e9c4f1b98d869bfed SHA256 88858dbb7733f3b62a5d2a3888372518ec6dd5a5d691df4f85b01b7841841835
 EBUILD openmpi-1.3.3.ebuild 2924 RMD160 7be09407ee0f70ae2ef507ec995495db6b89ec0c SHA1 eba24643cf769712cedefa099d4c0d17dc2a53be SHA256 df8571ff83e25af142273f0612249586d656130baf7b58dfac75fdf1e8ff2179
-MISC ChangeLog 8573 RMD160 859804626e2e0cce8e0c4985b174658f22b09c25 SHA1 483d9b7f78bab81c96a2c8358299c10d88c2f738 SHA256 e14a27fe7485152d1a14cb496ed3d0268f19b41f2028a9a2d40ea6f4ccffc072
+MISC ChangeLog 8756 RMD160 e8de2eb1cb554786a59666fe49c0a3a43ccdcc68 SHA1 6bdcb1940fdbb2b9321758af738242a5ece1047e SHA256 a72c7733ac2eca7714c3c7bf2c95f9e5c89adf6442eb199d21178d13ac00c10c
 MISC metadata.xml 600 RMD160 b60367dc458961c4d9ba4b4b548e31298e5aa6bf SHA1 11cdf219d236e2b6ce89b026f2ca8e0829de6758 SHA256 63dc7d01a07d5f1d2c9541075a52e62f12b36d7cf2d6510e38cb2bc5d539b055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqJ7WsACgkQ4MrvBE1wQ8mQOgCffOBqnDHBVRzwbWw9ykR9+zdN
-oe0An0Q2OJVr+XcEzZkn1WECGCkelpdk
-=FetY
+iEYEARECAAYFAkqJ9qEACgkQ4MrvBE1wQ8kENQCfQRClu3G3dZrJQ/jntOhc1A/0
+ThkAoJWdmkiTipFlypnFnfmti6UDs95T
+=zz2c
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/openmpi-1.2.9-r1.ebuild b/sys-cluster/openmpi/openmpi-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..672f74b36e04
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.2.9-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.9-r1.ebuild,v 1.1 2009/08/18 00:32:27 jsbronder Exp $
+
+EAPI=1
+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="+cxx fortran heterogeneous ipv6 mpi-threads 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 --with-wrapper-fcflags=-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 cxx 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"
+}