sys-cluster/openmpi-1.2.4-r1, use f90-size=medium when gfortran is not in use. Bug #166787.

Package-Manager: portage-2.1.3.19

4 files changed, 109 insertions, 5 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index bf3376827ef3..b356f7376add 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -9,10 +9,14 @@ EBUILD openmpi-1.1.2.ebuild 1895 RMD160 3cc617c1ebc26bf6075e5324de4749a64730587b
 MD5 edd67161c0e800ba443382fdce1ed06e openmpi-1.1.2.ebuild 1895
 RMD160 3cc617c1ebc26bf6075e5324de4749a64730587b openmpi-1.1.2.ebuild 1895
 SHA256 efc6d17a52e7e2e2636b2fef22d72795c0bc13ef3073814f5c2993b6419ea49b openmpi-1.1.2.ebuild 1895
-EBUILD openmpi-1.2.4.ebuild 2251 RMD160 389f6d3beb864514e7525cd0fdaa8e40bebe50fe SHA1 b4abcc25fba2cf461780f7c066a648b9b09ab353 SHA256 c7458ac4ef1fed4371152f427b76f2fb07e2945bc08b2afa0e5f1035caf78fe4
-MD5 7fca270b6ad34098e61db3b32477f8d1 openmpi-1.2.4.ebuild 2251
-RMD160 389f6d3beb864514e7525cd0fdaa8e40bebe50fe openmpi-1.2.4.ebuild 2251
-SHA256 c7458ac4ef1fed4371152f427b76f2fb07e2945bc08b2afa0e5f1035caf78fe4 openmpi-1.2.4.ebuild 2251
+EBUILD openmpi-1.2.4-r1.ebuild 2414 RMD160 4cf3bbe315c08069f5a5152f4532819910f9373b SHA1 de5e292ebf8621d2dced261494df0b4d01d1f873 SHA256 4a957cc3b39f0b9f28af8938af17ee36ca88470ad03f39a009355ef194255f28
+MD5 b020d9ca323a35a5dde7031be54846b1 openmpi-1.2.4-r1.ebuild 2414
+RMD160 4cf3bbe315c08069f5a5152f4532819910f9373b openmpi-1.2.4-r1.ebuild 2414
+SHA256 4a957cc3b39f0b9f28af8938af17ee36ca88470ad03f39a009355ef194255f28 openmpi-1.2.4-r1.ebuild 2414
+EBUILD openmpi-1.2.4.ebuild 2411 RMD160 342475c1994aa29464181f02157319a7c6d9063c SHA1 132e6f4a1b381defed02550e9724d0f948bc5008 SHA256 caa2a264818bc6a609acf9ad0e8aabd2f606d1a70cb5e5e6b55fdf9376f9505e
+MD5 5a27486f64569179b9f77377eb4aa443 openmpi-1.2.4.ebuild 2411
+RMD160 342475c1994aa29464181f02157319a7c6d9063c openmpi-1.2.4.ebuild 2411
+SHA256 caa2a264818bc6a609acf9ad0e8aabd2f606d1a70cb5e5e6b55fdf9376f9505e openmpi-1.2.4.ebuild 2411
 MISC ChangeLog 2895 RMD160 590b8d0046a0393a3f8a8d8de7c0635bcf66e0c6 SHA1 44f0638aaeb6abe973b4fb280e5043d4aa8a0ae6 SHA256 b1adf10f324ba88a670106bb53a5da85f31a976fb9107f50230943ff557aad68
 MD5 e2773e3e127b097d3f60cd8c81e407a8 ChangeLog 2895
 RMD160 590b8d0046a0393a3f8a8d8de7c0635bcf66e0c6 ChangeLog 2895
@@ -30,3 +34,6 @@ SHA256 cf22f3c1a55dbb344465ef1e85bb217b86f362cd1145230df30c8c98f268de93 files/di
 MD5 f6a738b2c429bf6b9e1a1f7fb4e007ab files/digest-openmpi-1.2.4 247
 RMD160 76d039d49ec8c7ab4ac1555cc483006a59f8f67e files/digest-openmpi-1.2.4 247
 SHA256 57b7cea0c0eb89c38a14e532c74fc799dac7436ee476825e1f45496cfd2e3a2c files/digest-openmpi-1.2.4 247
+MD5 f6a738b2c429bf6b9e1a1f7fb4e007ab files/digest-openmpi-1.2.4-r1 247
+RMD160 76d039d49ec8c7ab4ac1555cc483006a59f8f67e files/digest-openmpi-1.2.4-r1 247
+SHA256 57b7cea0c0eb89c38a14e532c74fc799dac7436ee476825e1f45496cfd2e3a2c files/digest-openmpi-1.2.4-r1 247
diff --git a/sys-cluster/openmpi/files/digest-openmpi-1.2.4-r1 b/sys-cluster/openmpi/files/digest-openmpi-1.2.4-r1
new file mode 100644
index 000000000000..f19425117f77
--- /dev/null
+++ b/sys-cluster/openmpi/files/digest-openmpi-1.2.4-r1
@@ -0,0 +1,3 @@
+MD5 311b38c597f54d8d6b277225ef458666 openmpi-1.2.4.tar.bz2 3541543
+RMD160 3eea820f19fcc69b4c1813331aa43171549aad25 openmpi-1.2.4.tar.bz2 3541543
+SHA256 594a3a0af69cc7895e0d8f9add776a44bf9ed389794323d0b1b45e181a97e538 openmpi-1.2.4.tar.bz2 3541543
diff --git a/sys-cluster/openmpi/openmpi-1.2.4-r1.ebuild b/sys-cluster/openmpi/openmpi-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..41d3cc19a277
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.2.4-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4-r1.ebuild,v 1.1 2007/12/14 15:58:10 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="pbs fortran nocxx threads romio slurm heterogeneous smp ipv6"
+RDEPEND="pbs? ( sys-cluster/torque )
+	!sys-cluster/mpich
+	!sys-cluster/lam-mpi
+	!sys-cluster/mpich2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use threads; then
+		ewarn
+		ewarn "WARNING: use of threads is still disabled by default in"
+		ewarn "upstream builds."
+		ewarn "You may stop now and set USE=-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_compile() {
+	local myconf="
+		--sysconfdir=/etc/${PN}
+		--without-xgrid
+		--enable-pretty-print-stacktrace
+		--enable-orterun-prefix-by-default"
+
+	if use threads; then
+		myconf="${myconf}
+			--enable-mpi-threads
+			--with-progress-threads
+			--with-threads=posix"
+	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 romio-io) \
+		$(use_enable smp smp-locks) \
+		$(use_enable heterogeneous) \
+		$(use_with pbs tm /usr/$(get_libdir)/pbs) \
+		$(use_with slurm) \
+		$(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
+}
diff --git a/sys-cluster/openmpi/openmpi-1.2.4.ebuild b/sys-cluster/openmpi/openmpi-1.2.4.ebuild
index 941ee0c71e7d..2d41ee0e3a6e 100644
--- a/sys-cluster/openmpi/openmpi-1.2.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.2.4.ebuild,v 1.3 2007/12/14 15:58:10 jsbronder Exp $
 
 inherit eutils multilib flag-o-matic toolchain-funcs fortran
 
@@ -62,6 +62,9 @@ src_compile() {
 		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}