commit: d2d7f8ea4bbfc013663711501a4fded66e3e6128 Author: Yuta Satoh <nigoro.dev <AT> gmail <DOT> com> AuthorDate: Wed Jan 10 13:49:44 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jan 27 08:22:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d7f8ea
sys-cluster/openmpi: Fix dependency issue for Gentoo/FreeBSD. Bug: https://bugs.gentoo.org/489984 Package-Manager: Portage-2.3.13, Repoman-2.3.3 sys-cluster/openmpi/openmpi-1.10.7.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.4.3.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.4.5.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-1.8.8.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-2.0.2.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-2.0.4.ebuild | 4 ++-- sys-cluster/openmpi/openmpi-2.1.2.ebuild | 4 ++-- sys-cluster/openmpi/{openmpi-3.0.0.ebuild => openmpi-3.0.0-r1.ebuild} | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild index b5f0b4edbf3..1e9755408ff 100644 --- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild +++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -63,7 +63,7 @@ CDEPEND=" >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild index 4b8de0f2d9e..26a9f682d27 100644 --- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild +++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,7 +23,7 @@ RDEPEND=" !dev-libs/libotf !app-text/lcdf-typetools ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec" diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild index a810a5a3e3c..86fb9bf1eea 100644 --- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild +++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -25,7 +25,7 @@ RDEPEND=" !dev-libs/libotf !app-text/lcdf-typetools ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) !sys-cluster/mpich !sys-cluster/mpich2 !sys-cluster/mpiexec" diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild index 51c493411e1..977ad9484e6 100644 --- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -54,7 +54,7 @@ RDEPEND=" !sys-cluster/mpiexec >=sys-apps/hwloc-1.3 dev-libs/libltdl:0 - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_dapl? ( sys-fabric/dapl ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild index ad59007d9d7..efe14693943 100644 --- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -59,7 +59,7 @@ RDEPEND=" dev-libs/libltdl:0 >=sys-apps/hwloc-1.7.2 cuda? ( dev-util/nvidia-cuda-toolkit ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild index f028d430161..1eaa1042367 100644 --- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -62,7 +62,7 @@ RDEPEND=" >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild index fccf7a7c828..7c24c4df122 100644 --- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -62,7 +62,7 @@ CDEPEND=" >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild index af6407a8a70..a940676eb17 100644 --- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -62,7 +62,7 @@ CDEPEND=" >=sys-apps/hwloc-1.9.1[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_open-mx? ( sys-cluster/open-mx ) diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild index 5553a3fcd9c..6874cdda5d3 100644 --- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild +++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,7 +57,7 @@ CDEPEND=" >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild index e1517dff800..4be809c2952 100644 --- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild +++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -57,7 +57,7 @@ CDEPEND=" <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) diff --git a/sys-cluster/openmpi/openmpi-2.1.2.ebuild b/sys-cluster/openmpi/openmpi-2.1.2.ebuild index 0ef453d9dc7..d27771af895 100644 --- a/sys-cluster/openmpi/openmpi-2.1.2.ebuild +++ b/sys-cluster/openmpi/openmpi-2.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ CDEPEND=" >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) diff --git a/sys-cluster/openmpi/openmpi-3.0.0.ebuild b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild similarity index 97% rename from sys-cluster/openmpi/openmpi-3.0.0.ebuild rename to sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild index b50c4f2ad16..3626af9f53e 100644 --- a/sys-cluster/openmpi/openmpi-3.0.0.ebuild +++ b/sys-cluster/openmpi/openmpi-3.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,7 +53,7 @@ CDEPEND=" >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) - elibc_FreeBSD? ( dev-libs/libexecinfo ) + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) openmpi_fabrics_knem? ( sys-cluster/knem ) openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
