commit:     0f6805dd9a20ae4b787b7544da8cb6020ee59da0
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 11:27:32 2021 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 11:27:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f6805dd

sys-cluster/openmpi: Bump

Also fix dependencies to allow rdma-core instead of sys-fabric/*

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 sys-cluster/openmpi/Manifest             |   1 +
 sys-cluster/openmpi/openmpi-4.0.5.ebuild | 166 +++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 97fe13c0bcb..24ffd9a7c69 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -10,3 +10,4 @@ DIST openmpi-3.1.4.tar.bz2 9468371 BLAKE2B 
70a93aa170086f43b2eb4f9b7c74673065bd3
 DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 
000faa8ff032f9aa6bf5f0a14fb9a363080cfcdd7c6f8ab90bc9507fd7a473d70502574ee1e75c88acecb06c516a643ef7b9e804fb580be9fc860b7b1fb1cc5d
 SHA512 
634d45d989f1e0b8848bfb4eb4527c7edd76d4fccd77a5f8d85a46a5822f97ba653adf13df857c87ae56a8117b4ae2d45ec24249c6ee41a562446d4112ddb770
 DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 
571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f
 SHA512 
01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 
3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72
 SHA512 
6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
+DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 
9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1
 SHA512 
b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011

diff --git a/sys-cluster/openmpi/openmpi-4.0.5.ebuild 
b/sys-cluster/openmpi/openmpi-4.0.5.ebuild
new file mode 100644
index 00000000000..6f6f5b1017c
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-4.0.5.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED=fortran
+
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib 
multilib-minimal
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+       openmpi_fabrics_ofed
+       openmpi_fabrics_knem
+       openmpi_fabrics_psm"
+
+IUSE_OPENMPI_RM="
+       openmpi_rm_pbs
+       openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+       openmpi_ofed_features_control-hdr-padding
+       openmpi_ofed_features_udcm
+       openmpi_ofed_features_rdmacm
+       openmpi_ofed_features_dynamic-sl"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="https://www.open-mpi.org";
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 
1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="cma cuda cxx fortran heterogeneous ipv6 java romio
+       ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} 
${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+       openmpi_rm_pbs? ( !openmpi_rm_slurm )
+       openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+       openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+       openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
+       openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+       openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )"
+
+CDEPEND="
+       !sys-cluster/mpich
+       !sys-cluster/mpich2
+       !sys-cluster/nullmpi
+       >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads]
+       dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+       >=sys-apps/hwloc-2.0.2[${MULTILIB_USEDEP}]
+       >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+       cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+       openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) )
+       openmpi_fabrics_knem? ( sys-cluster/knem )
+       openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
+       openmpi_rm_pbs? ( sys-cluster/torque )
+       openmpi_rm_slurm? ( sys-cluster/slurm )
+       openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core 
sys-fabric/librdmacm:* ) )"
+
+RDEPEND="${CDEPEND}
+       java? ( >=virtual/jre-1.6 )"
+
+DEPEND="${CDEPEND}
+       java? ( >=virtual/jdk-1.6 )"
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/mpi.h
+       /usr/include/openmpi/ompi/mpi/java/mpiJava.h
+)
+
+pkg_setup() {
+       fortran-2_pkg_setup
+       java-pkg-opt-2_pkg_setup
+
+       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
+}
+
+src_prepare() {
+       default
+
+       # Necessary for scalibility, see
+       # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+       echo 'oob_tcp_listen_mode = listen_thread' \
+               >> opal/etc/openmpi-mca-params.conf || die
+}
+
+multilib_src_configure() {
+       if use java; then
+               # We must always build with the right -source and -target
+               # flags. Passing flags to javac isn't explicitly supported here
+               # but we can cheat by overriding the configure test for javac.
+               export ac_cv_path_JAVAC="$(java-pkg_get-javac) 
$(java-pkg_javac-args)"
+       fi
+
+       ECONF_SOURCE=${S} econf \
+               --sysconfdir="${EPREFIX}/etc/${PN}" \
+               --enable-pretty-print-stacktrace \
+               --enable-orterun-prefix-by-default \
+               --with-hwloc="${EPREFIX}/usr" \
+               --with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --with-libltdl="${EPREFIX}/usr" \
+               --with-libevent="${EPREFIX}/usr" \
+               --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" \
+               --enable-mpi-fortran=$(usex fortran all no) \
+               $(use_enable cxx mpi-cxx) \
+               $(use_with cma) \
+               $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) \
+               $(use_enable romio io-romio) \
+               $(use_enable heterogeneous) \
+               $(use_enable ipv6) \
+               $(multilib_native_use_enable java mpi-java) \
+               $(multilib_native_use_with openmpi_fabrics_ofed verbs 
"${EPREFIX}"/usr) \
+               $(multilib_native_use_with openmpi_fabrics_knem knem 
"${EPREFIX}"/usr) \
+               $(multilib_native_use_with openmpi_fabrics_psm psm 
"${EPREFIX}"/usr) \
+               $(multilib_native_use_enable 
openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+               $(multilib_native_use_enable openmpi_ofed_features_rdmacm 
openib-rdmacm) \
+               $(multilib_native_use_enable openmpi_ofed_features_udcm 
openib-udcm) \
+               $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl 
openib-dynamic-sl) \
+               $(multilib_native_use_with openmpi_rm_pbs tm) \
+               $(multilib_native_use_with openmpi_rm_slurm slurm)
+}
+
+multilib_src_test() {
+       # Doesn't work with the default src_test as the dry run (-n) fails.
+       emake -j1 check
+}
+
+multilib_src_install() {
+       default
+
+       # fortran header cannot be wrapped (bug #540508), workaround part 1
+       if multilib_is_native_abi && use fortran; then
+               mkdir "${T}"/fortran || die
+               mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+       else
+               # some fortran files get installed unconditionally
+               rm \
+                       "${ED}"/usr/include/mpif* \
+                       "${ED}"/usr/bin/mpif* \
+                       || die
+       fi
+}
+
+multilib_src_install_all() {
+       # fortran header cannot be wrapped (bug #540508), workaround part 2
+       if use fortran; then
+               mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
+       fi
+
+       # Remove la files, no static libs are installed and we have pkg-config
+       find "${ED}" -name '*.la' -delete || die
+
+       if use java; then
+               local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
+               java-pkg_dojar "${mpi_jar}"
+               # We don't want to install the jar file twice
+               # so let's clean after ourselves.
+               rm "${mpi_jar}" || die
+       fi
+       einstalldocs
+}

Reply via email to