From a859687b1a57129324235387787a0c20f8c972cc Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Fri, 18 Jun 2010 19:23:31 -0400 Subject: Rename 1.4.1 as 1.4.1-r1 so users can easily get stable version from main tree. (Portage version: 2.2_rc67/git/Linux x86_64, RepoMan options: --force) (Signed Manifest commit) --- sys-cluster/openmpi/ChangeLog | 7 ++ sys-cluster/openmpi/Manifest | 14 +++- sys-cluster/openmpi/openmpi-1.4.1-r1.ebuild | 114 ++++++++++++++++++++++++++++ sys-cluster/openmpi/openmpi-1.4.1.ebuild | 114 ---------------------------- 4 files changed, 133 insertions(+), 116 deletions(-) create mode 100644 sys-cluster/openmpi/openmpi-1.4.1-r1.ebuild delete mode 100644 sys-cluster/openmpi/openmpi-1.4.1.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog index 1394cdb3d..fe0e51e8c 100644 --- a/sys-cluster/openmpi/ChangeLog +++ b/sys-cluster/openmpi/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openmpi-1.4.1-r1 (18 Jun 2010) + + 18 Jun 2010; Justin Bronder -openmpi-1.4.1.ebuild, + +openmpi-1.4.1-r1.ebuild: + Rename 1.4.1 as 1.4.1-r1 so users can easily get stable version from main + tree. + 03 Feb 2010; Justin Bronder openmpi-1.4.1.ebuild, +files/openmpi-1.4.1-r22513.patch: Add upstream fix for wrapper flag ordering diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest index 71a0aa277..c635ff801 100644 --- a/sys-cluster/openmpi/Manifest +++ b/sys-cluster/openmpi/Manifest @@ -1,10 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX eselect.mpi.openmpi 225 RMD160 cf81165864aaad2833f7a8300c20376210a575dd SHA1 8b50b90346b52b831a59ec0abd8e3dbebad2b94e SHA256 df4d363e9fbab74c234b75f426b7f38ef83d16da2b099222c0dde4a2c3ece687 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379 DIST openmpi-1.3.3.tar.bz2 6695647 RMD160 209972fdbf52787ea0482d9b89fad2c1f59e6e87 SHA1 f668feb22ff0a4c4d9b438e4e69a97b08aa73234 SHA256 e1425853282da9237f5b41330207e54da1dc803a2e19a93dacc3eca1d083e422 DIST openmpi-1.4.1.tar.bz2 6571835 RMD160 c6fd5f0871eb5f963fe58270f5340a2629f5fd68 SHA1 c5107c03a9fc738dfb4f309b470d052becfdde19 SHA256 d4d71d7c670d710d2d283ea60af50d6c315318a4c35ec576bedfd0f3b7b8c218 DIST openmpi-1.4.tar.bz2 6699638 RMD160 61f7665c69ea019d347b983062a1eee0ae807c9b SHA1 8e98ceae223f52f147d5151779ed1a43f2865a7f SHA256 fa55edef1bd8af256e459d4d9782516c6998b9d4698eda097d5df33ae499858e EBUILD openmpi-1.3.3.ebuild 2907 RMD160 28f671b67cb8423c923377d1b1c4596798ecf878 SHA1 a9ab364c1104bd769f50a42186491b6358f88364 SHA256 c2bab10c70f85bdd1b1f029a9a708f360a558fbc58c1fd1858a05a7c3365d68d -EBUILD openmpi-1.4.1.ebuild 2996 RMD160 e2d9027c25d614035c894175124542340bdf3671 SHA1 b77bc16233bf970aacbbefe56f2e43aa5282ab37 SHA256 b9db925aca0601039dd2ec6b8071b3dae33409b62d05480942e426932b2360d1 +EBUILD openmpi-1.4.1-r1.ebuild 2996 RMD160 e2d9027c25d614035c894175124542340bdf3671 SHA1 b77bc16233bf970aacbbefe56f2e43aa5282ab37 SHA256 b9db925aca0601039dd2ec6b8071b3dae33409b62d05480942e426932b2360d1 EBUILD openmpi-1.4.ebuild 2905 RMD160 bca7ff76c9ab92db2a9f475b5b995d25faeac3e6 SHA1 76022fd4c572a52665495ce9850645b65ba8ff19 SHA256 0e9b38ac5f98549468ad981fc70d22506f7112eaa267655c65c91b1a282d3c5a -MISC ChangeLog 2370 RMD160 2294304b7354670a871a61012efd4b14aafe9b57 SHA1 b21e406f0b629e01d2b3eb1bec71b80dae37da98 SHA256 d63d268041169c3533983cfc4c7ab3d083d21bbcdd419f98342e459db72c96a5 +MISC ChangeLog 2592 RMD160 e4d7d70be3e842ee90318322f12836579afc0f07 SHA1 9e689dbe8ca64f9d60152ecc038fb9da62692dc4 SHA256 b6eae3a57074ae88ba14b52fc716dada6e9dd19153b9eb3b68dcb34d9958f6fb MISC metadata.xml 706 RMD160 d497cb759e382f2b07d5233f99f391e5c6f667d3 SHA1 870215f9b18002f5dc24fa742b0e740a8d730e4f SHA256 11a597b8ce26a8293a4b7ad9f0373c0c57ad99425ede80e8136747fab504807e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkwb//MACgkQ4MrvBE1wQ8lljACfZopnbXVqIX5CMl8ucglFDDn6 +HJIAoIzVMifv5fXn29qbPBi2vWbfV6Et +=cntH +-----END PGP SIGNATURE----- diff --git a/sys-cluster/openmpi/openmpi-1.4.1-r1.ebuild b/sys-cluster/openmpi/openmpi-1.4.1-r1.ebuild new file mode 100644 index 000000000..18f3d6903 --- /dev/null +++ b/sys-cluster/openmpi/openmpi-1.4.1-r1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2010 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 $ + +EAPI=2 +inherit eutils multilib flag-o-matic toolchain-funcs fortran mpi + +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.4/downloads/${MY_P}.tar.bz2" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +RESTRICT="mpi-threads? ( test )" +IUSE="+cxx fortran heterogeneous ipv6 infiniband mpi-threads pbs romio threads vt" +RDEPEND="pbs? ( sys-cluster/torque ) + vt? ( + !dev-libs/libotf + !app-text/lcdf-typetools + ) + infiniband? ( sys-infiniband/libibverbs ) + $(mpi_imp_deplist)" +DEPEND="${RDEPEND}" + +pkg_setup() { + MPI_ESELECT_FILE="eselect.mpi.openmpi" + + 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_prepare() { + # Fix --as-needed problems with f77 and f90. + sed -i 's:^libs=:libs=-Wl,--no-as-needed :' \ + ompi/tools/wrappers/mpif{77,90}-wrapper-data.txt.in + + # 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 + + # https://svn.open-mpi.org/trac/ompi/ticket/2201 + epatch "${FILESDIR}"/${P}-r22513.patch +} + +src_configure() { + local c=" + --without-xgrid + --enable-pretty-print-stacktrace + --enable-orterun-prefix-by-default + --without-slurm" + + if use mpi-threads; then + c="${c} + --enable-mpi-threads + --enable-progress-threads" + fi + + if use fortran; then + if [[ "${FORTRANC}" = "g77" ]]; then + c="${c} --disable-mpi-f90" + elif [[ "${FORTRANC}" = if* ]]; then + # Enabled here as gfortran compile times are huge with this enabled. + c="${c} --with-mpi-f90-size=medium" + fi + else + c="${c} + --disable-mpi-f90 + --disable-mpi-f77" + fi + + ! use vt && c="${c} --enable-contrib-no-build=vt" + econf $(mpi_econf_args) ${c} \ + $(use_enable cxx mpi-cxx) \ + $(use_enable romio io-romio) \ + $(use_enable heterogeneous) \ + $(use_with pbs tm) \ + $(use_enable ipv6) \ + $(use_with infiniband openib) +} + +src_install () { + emake DESTDIR="${D}" install || die + mpi_dodoc README AUTHORS NEWS VERSION + mpi_imp_add_eselect +} + +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" +} diff --git a/sys-cluster/openmpi/openmpi-1.4.1.ebuild b/sys-cluster/openmpi/openmpi-1.4.1.ebuild deleted file mode 100644 index 18f3d6903..000000000 --- a/sys-cluster/openmpi/openmpi-1.4.1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2010 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 $ - -EAPI=2 -inherit eutils multilib flag-o-matic toolchain-funcs fortran mpi - -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.4/downloads/${MY_P}.tar.bz2" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" -RESTRICT="mpi-threads? ( test )" -IUSE="+cxx fortran heterogeneous ipv6 infiniband mpi-threads pbs romio threads vt" -RDEPEND="pbs? ( sys-cluster/torque ) - vt? ( - !dev-libs/libotf - !app-text/lcdf-typetools - ) - infiniband? ( sys-infiniband/libibverbs ) - $(mpi_imp_deplist)" -DEPEND="${RDEPEND}" - -pkg_setup() { - MPI_ESELECT_FILE="eselect.mpi.openmpi" - - 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_prepare() { - # Fix --as-needed problems with f77 and f90. - sed -i 's:^libs=:libs=-Wl,--no-as-needed :' \ - ompi/tools/wrappers/mpif{77,90}-wrapper-data.txt.in - - # 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 - - # https://svn.open-mpi.org/trac/ompi/ticket/2201 - epatch "${FILESDIR}"/${P}-r22513.patch -} - -src_configure() { - local c=" - --without-xgrid - --enable-pretty-print-stacktrace - --enable-orterun-prefix-by-default - --without-slurm" - - if use mpi-threads; then - c="${c} - --enable-mpi-threads - --enable-progress-threads" - fi - - if use fortran; then - if [[ "${FORTRANC}" = "g77" ]]; then - c="${c} --disable-mpi-f90" - elif [[ "${FORTRANC}" = if* ]]; then - # Enabled here as gfortran compile times are huge with this enabled. - c="${c} --with-mpi-f90-size=medium" - fi - else - c="${c} - --disable-mpi-f90 - --disable-mpi-f77" - fi - - ! use vt && c="${c} --enable-contrib-no-build=vt" - econf $(mpi_econf_args) ${c} \ - $(use_enable cxx mpi-cxx) \ - $(use_enable romio io-romio) \ - $(use_enable heterogeneous) \ - $(use_with pbs tm) \ - $(use_enable ipv6) \ - $(use_with infiniband openib) -} - -src_install () { - emake DESTDIR="${D}" install || die - mpi_dodoc README AUTHORS NEWS VERSION - mpi_imp_add_eselect -} - -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" -} -- cgit v1.2.3-18-g5258