sys-cluster/openmpi: dep on v1 hwloc

Fixes #665372.  Thanks to Kjell Claesson for the report.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index d9445be72cf37016995a4e71cf91a6c1881a8f83..0e6ce190c374a775513e5e2db116b1b38d4c23aa 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -61,7 +61,7 @@ CDEPEND="
        !sys-cluster/pmix
        >=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}]
        dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-       >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?]
+       <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 >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index a5befadf3e4b582e10b2fddbe3f12f3f68564842..3600523ee5a222feefdaf86b25d6883d2594cf36 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
        !sys-cluster/mpich2
        !sys-cluster/mpiexec
        !sys-cluster/pmix
-       >=sys-apps/hwloc-1.3
+       <sys-apps/hwloc-2
        dev-libs/libltdl:0
        elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_dapl? ( sys-fabric/dapl )

diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index c3cccad1880cd555f12d5a4591b93a9aac9f18ca..8c0bcae38a87f02ff2ffcb4b86eb196731155bc9 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
        !sys-cluster/pmix
        dev-libs/libevent
        dev-libs/libltdl:0
-       >=sys-apps/hwloc-1.7.2
+       <sys-apps/hwloc-2
        cuda? ( dev-util/nvidia-cuda-toolkit )
        elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
        openmpi_fabrics_ofed? ( sys-fabric/ofed )

diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index 1c5265167384f13ba64459bb043fa33c65351bda..bd218f14d8dcfcc4bd4068cbc65bb81b223385fa 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
        !sys-cluster/pmix
        dev-libs/libevent
        dev-libs/libltdl:0
-       >=sys-apps/hwloc-1.9.1[numa?]
+       <sys-apps/hwloc-2[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
        elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index e744ac73c6caccaac23159e3725d37e60827c683..3607234253574307fbd09727ed8df7092c42ea3b 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
        !sys-cluster/pmix
        dev-libs/libevent
        dev-libs/libltdl:0
-       >=sys-apps/hwloc-1.9.1[numa?]
+       <sys-apps/hwloc-2[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
        elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 98a3502fcb4386292f0ff7b94e02c34358b4f117..3e7db1e7dfd5c907781d87e14129850ebe58e3bb 100644 (file)
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
        !sys-cluster/pmix
        dev-libs/libevent
        dev-libs/libltdl:0
-       >=sys-apps/hwloc-1.9.1[numa?]
+       <sys-apps/hwloc-2[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
        elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index 89dd842faa597e4ce4b443cbda495f989df4e4db..4c907476d293ffdbe57de1e319e8808dca80da97 100644 (file)
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -55,7 +55,7 @@ CDEPEND="
        !sys-cluster/pmix
        >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
        dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-       >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+       <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 >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-2.1.5.ebuild b/sys-cluster/openmpi/openmpi-2.1.5.ebuild
index a100f6b01cec210ae265337c140e3418e8a09145..48a9ae2b37711c3c7666336485deea66aaefff41 100644 (file)
--- a/sys-cluster/openmpi/openmpi-2.1.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.5.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
        !sys-cluster/pmix
        >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
        dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-       >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+       <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 >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-3.0.2.ebuild b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
index c9ae7f37806b27500fbfaf4e37265840c765b1ad..4143e0808050c149b78a46b0877983ff1e340c59 100644 (file)
--- a/sys-cluster/openmpi/openmpi-3.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.2.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
        !sys-cluster/pmix
        >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
        dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-       >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+       <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 >=sys-freebsd/freebsd-lib-10.0 ) )

diff --git a/sys-cluster/openmpi/openmpi-3.1.2.ebuild b/sys-cluster/openmpi/openmpi-3.1.2.ebuild
index c9ae7f37806b27500fbfaf4e37265840c765b1ad..4143e0808050c149b78a46b0877983ff1e340c59 100644 (file)
--- a/sys-cluster/openmpi/openmpi-3.1.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.2.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
        !sys-cluster/pmix
        >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
        dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-       >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
+       <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 >=sys-freebsd/freebsd-lib-10.0 ) )