aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJian Cao <sworden.cao@gmail.com>2019-04-05 04:46:56 +0800
committerJustin Bronder <jsbronder@gentoo.org>2019-04-08 17:56:12 -0400
commit9b561f5c757362a404c9a7505b7344602a649ad3 (patch)
tree4fcee844aa9f80aa44813eefadfa03fbb58f3820
parentsci-biology/behaviopy: new package (diff)
downloadsci-9b561f5c757362a404c9a7505b7344602a649ad3.tar.gz
sci-9b561f5c757362a404c9a7505b7344602a649ad3.tar.bz2
sci-9b561f5c757362a404c9a7505b7344602a649ad3.zip
sys-cluster/openmpi: specify external libraries and version bump
Closes: https://bugs.gentoo.org/671510 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jian Cao <sworden.cao@gmail.com> Signed-off-by: Justin Bronder <jsbronder@gentoo.org>
-rw-r--r--sys-cluster/openmpi/Manifest2
-rw-r--r--sys-cluster/openmpi/openmpi-4.0.1.ebuild (renamed from sys-cluster/openmpi/openmpi-4.0.0.ebuild)6
2 files changed, 4 insertions, 4 deletions
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index e4dc0cd12..2f1c88c46 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -4,4 +4,4 @@ DIST openmpi-2.0.4.tar.bz2 8272983 BLAKE2B 7d0a392fbc8c896cdccefb9bf0ff83fbd8db8
DIST openmpi-2.1.6.tar.bz2 8324626 BLAKE2B 4aed4b397c0e0ead24ed5e9bbf45ee8f6719a7566d74405cccf119ddf535891ece91c04cbcad96be5a5d9805c620aa13a1b51c0edd67c049827357e7668008b9 SHA512 f552f47961e040476e7d2949cdd3e5a0b5ad74bea2b6532608117ec893473a160cd368251d1f439fd773f4846950857baf939e7b3586bac2a099495f7bc0e349
DIST openmpi-3.0.3.tar.bz2 9316109 BLAKE2B e67e649917911eff3286c0f3d15e181b30e4ac6061891f6e13c75570368edb943fff55e4d41ffaa4a095b2060c84d24f8c32975758ad4632bae1813accd9f516 SHA512 12bbc5add4160e732ac10f302106c4bc2fa61ef2cde955e1fdd4a7aaad44b022d6babdd4bd529f687bb03fc5e5c3804ba6b1869e9609c9725bc291524c8304d7
DIST openmpi-3.1.3.tar.bz2 9442937 BLAKE2B 40067e1694a106d96e5ba41884a6facec9e605b5afba03ab908e4cf124f35b0691f0ab626e5190cffebc9c28d05b11b5c6401a5aa39ac17ec04650ed29e0976e SHA512 700821df676de5f85ce2793298242dcaea73f585f89540e30999792a568f193545a9f9b2bcb3ea22effa3bf14744531c4eb5fc4c84a8d7bbe5e5fdd76ab3a04a
-DIST openmpi-4.0.0.tar.bz2 9812193 BLAKE2B e5307c22ce4c9aac8d0efe5a659dfa79b4471020ece095e84026914eab8edf030b59bbac2a37405851a904aeb4d4b3a33ce8de4cd25218dcb9f37626a3540ff5 SHA512 978097dcbb16df2a616dcbbef9536fed0f7be40914daa8f927882d91bdda9265e54334fc12aeef49b41073d8782321b5611a7e9c71182258a45bca5f640e927b
+DIST openmpi-4.0.1.tar.bz2 9838152 BLAKE2B 75657940e37c23fbe88032f116588960c6bcf34c4928d77b45e8fde6fb51e814f521adb6c5155cb588fff9d1b382c2470873d90979a68598ff13e1aa205fc811 SHA512 09f35dc2e44b4f84aab9c5af9d81f90bbdb030e4d90800a5d3ffae88cb32b7faecc9bea0abb113da53c21f73e9d19db68f961f997bc47bdd28d83a87beee0731
diff --git a/sys-cluster/openmpi/openmpi-4.0.0.ebuild b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
index 5fd6e1b85..670d49012 100644
--- a/sys-cluster/openmpi/openmpi-4.0.0.ebuild
+++ b/sys-cluster/openmpi/openmpi-4.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
FORTRAN_NEEDED=fortran
-inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal mpi
+inherit cuda eapi7-ver flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal mpi
MY_P=${P/-mpi}
S=${WORKDIR}/${MY_P}
@@ -106,8 +106,10 @@ multilib_src_configure() {
--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) \
@@ -144,8 +146,6 @@ multilib_src_install() {
rm \
"${ED}"/$(mpi_root)/usr/include/mpif* \
"${ED}"/$(mpi_root)/usr/bin/mpif* \
- "${ED}"/$(mpi_root)/usr/bin/oshfort \
- "${ED}"/$(mpi_root)/usr/bin/shmemfort \
|| die
fi
}