diff options
Diffstat (limited to 'sys-cluster/openmpi/openmpi-2.1.6.ebuild')
-rw-r--r-- | sys-cluster/openmpi/openmpi-2.1.6.ebuild | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild index 8fead75c26b0..bb8a65b2cf1c 100644 --- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild +++ b/sys-cluster/openmpi/openmpi-2.1.6.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 FORTRAN_NEEDED=fortran -inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal +inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal MY_P=${P/-mpi} S=${WORKDIR}/${MY_P} @@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES=" DESCRIPTION="A high-performance message passing library (MPI)" HOMEPAGE="https://www.open-mpi.org" -SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2" +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" @@ -140,14 +140,14 @@ multilib_src_install() { # 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 + mv "${ED}"/usr/include/mpif* "${T}"/fortran || die else # some fortran files get installed unconditionally rm \ - "${ED}"usr/include/mpif* \ - "${ED}"usr/bin/mpif* \ - "${ED}"usr/bin/oshfort \ - "${ED}"usr/bin/shmemfort \ + "${ED}"/usr/include/mpif* \ + "${ED}"/usr/bin/mpif* \ + "${ED}"/usr/bin/oshfort \ + "${ED}"/usr/bin/shmemfort \ || die fi } @@ -155,14 +155,14 @@ multilib_src_install() { 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 + 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 + 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. |