From fadabb5fbc363a559b87481ee6d318a58236df77 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Fri, 3 Feb 2012 21:55:52 +0000 Subject: cleanup (Portage version: 2.1.10.11/cvs/Linux x86_64) --- sys-cluster/openmpi/ChangeLog | 8 +- sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild | 130 --------------------------- sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild | 131 ++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 131 deletions(-) delete mode 100644 sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild create mode 100644 sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog index e7d66e5e3c69..fd2b9cc9dd13 100644 --- a/sys-cluster/openmpi/ChangeLog +++ b/sys-cluster/openmpi/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/openmpi # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.97 2012/02/03 20:44:18 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.98 2012/02/03 21:55:52 jsbronder Exp $ + +*openmpi-1.5.4-r3 (03 Feb 2012) + + 03 Feb 2012; Justin Bronder -openmpi-1.5.4-r2.ebuild, + +openmpi-1.5.4-r3.ebuild: + cleanup *openmpi-1.4.4 (03 Feb 2012) diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild deleted file mode 100644 index 624de8b2b87f..000000000000 --- a/sys-cluster/openmpi/openmpi-1.5.4-r2.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/01/20 13:15:19 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 knem mpi-threads - +numa pbs open-mx psm romio sctp slurm threads vt" - -REQUIRED_USE="^^ ( - ( !slurm !pbs ) - ( slurm !pbs ) - ( !slurm pbs ) - ) - psm? ( infiniband )" - -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 ) - knem? ( sys-cluster/knem ) - numa? ( sys-process/numactl ) - open-mx? ( sys-cluster/open-mx ) - psm? ( sys-infiniband/infinipath-psm ) - >=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 numa && myconf+=( --with-libnuma="${EPREFIX}/usr" ) - use infiniband && myconf+=( --with-openib="${EPREFIX}/usr" ) - use open-mx && myconf+=( --with-mx="${EPREFIX}/usr" ) - use psm && myconf+=( --with-psm="${EPREFIX}/usr" ) - use knem && myconf+=( --with-knem="${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 "${ED}"/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" -} diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild new file mode 100644 index 000000000000..3c0df1af4dc3 --- /dev/null +++ b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2012 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-r3.ebuild,v 1.1 2012/02/03 21:55:52 jsbronder 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/v${P%.*}/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 knem mpi-threads + +numa open-mx pbs psm romio sctp slurm threads vt" + +REQUIRED_USE="slurm? ( !pbs ) + pbs? ( !slurm ) + psm? ( infiniband )" + +RDEPEND=" + elibc_FreeBSD? ( dev-libs/libexecinfo ) + fortran? ( virtual/fortran ) + infiniband? ( sys-infiniband/openib ) + knem? ( sys-cluster/knem ) + numa? ( sys-process/numactl ) + open-mx? ( sys-cluster/open-mx ) + pbs? ( sys-cluster/torque ) + psm? ( sys-infiniband/infinipath-psm ) + sctp? ( net-misc/lksctp-tools ) + vt? ( + !dev-libs/libotf + !app-text/lcdf-typetools + ) + >=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 numa && myconf+=( --with-libnuma="${EPREFIX}/usr" ) + use infiniband && myconf+=( --with-openib="${EPREFIX}/usr" ) + use open-mx && myconf+=( --with-mx="${EPREFIX}/usr" ) + use psm && myconf+=( --with-psm="${EPREFIX}/usr" ) + use knem && myconf+=( --with-knem="${EPREFIX}/usr" ) + + econf "${myconf[@]}" \ + $(use_enable cxx mpi-cxx) \ + $(use_enable romio io-romio) \ + $(use_enable heterogeneous) \ + $(use_enable ipv6) \ + $(use_with infiniband openib "${EPREFIX}"/usr) \ + $(use_with knem knem "${EPREFIX}"/usr) \ + $(use_with numa libnuma "${EPREFIX}"/usr) \ + $(use_with open-mx mx "${EPREFIX}"/usr) \ + $(use_with pbs tm) \ + $(use_with psm psm "${EPREFIX}"/usr) \ + $(use_with sctp sctp) \ + $(use_with slurm) +} + +src_install () { + emake DESTDIR="${D}" install || die "make install failed" + # From USE=vt see #359917 + rm "${ED}"/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" +} -- cgit v1.2.3-65-gdbad