1 |
commit: 05e1ba41dff2aaf68bafd69e50863928fa04e2b5 |
2 |
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 11 14:29:41 2018 +0000 |
4 |
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 11 14:29:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e1ba41 |
7 |
|
8 |
sys-cluster/openmpi: dep on v1 hwloc |
9 |
|
10 |
Fixes #665372. Thanks to Kjell Claesson for the report. |
11 |
|
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
sys-cluster/openmpi/openmpi-1.10.7.ebuild | 2 +- |
15 |
sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild | 2 +- |
16 |
sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild | 2 +- |
17 |
sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild | 2 +- |
18 |
sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild | 2 +- |
19 |
sys-cluster/openmpi/openmpi-1.8.8.ebuild | 2 +- |
20 |
sys-cluster/openmpi/openmpi-2.0.2.ebuild | 2 +- |
21 |
sys-cluster/openmpi/openmpi-2.1.5.ebuild | 2 +- |
22 |
sys-cluster/openmpi/openmpi-3.0.2.ebuild | 2 +- |
23 |
sys-cluster/openmpi/openmpi-3.1.2.ebuild | 2 +- |
24 |
10 files changed, 10 insertions(+), 10 deletions(-) |
25 |
|
26 |
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild |
27 |
index d9445be72cf..0e6ce190c37 100644 |
28 |
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild |
29 |
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild |
30 |
@@ -61,7 +61,7 @@ CDEPEND=" |
31 |
!sys-cluster/pmix |
32 |
>=dev-libs/libevent-2.0.21[${MULTILIB_USEDEP}] |
33 |
dev-libs/libltdl:0[${MULTILIB_USEDEP}] |
34 |
- >=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP},numa?] |
35 |
+ <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?] |
36 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
37 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) |
38 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
39 |
|
40 |
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild |
41 |
index a5befadf3e4..3600523ee5a 100644 |
42 |
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild |
43 |
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild |
44 |
@@ -53,7 +53,7 @@ RDEPEND=" |
45 |
!sys-cluster/mpich2 |
46 |
!sys-cluster/mpiexec |
47 |
!sys-cluster/pmix |
48 |
- >=sys-apps/hwloc-1.3 |
49 |
+ <sys-apps/hwloc-2 |
50 |
dev-libs/libltdl:0 |
51 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
52 |
openmpi_fabrics_dapl? ( sys-fabric/dapl ) |
53 |
|
54 |
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild |
55 |
index c3cccad1880..8c0bcae38a8 100644 |
56 |
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild |
57 |
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild |
58 |
@@ -58,7 +58,7 @@ RDEPEND=" |
59 |
!sys-cluster/pmix |
60 |
dev-libs/libevent |
61 |
dev-libs/libltdl:0 |
62 |
- >=sys-apps/hwloc-1.7.2 |
63 |
+ <sys-apps/hwloc-2 |
64 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
65 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
66 |
openmpi_fabrics_ofed? ( sys-fabric/ofed ) |
67 |
|
68 |
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild |
69 |
index 1c526516738..bd218f14d8d 100644 |
70 |
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild |
71 |
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild |
72 |
@@ -60,7 +60,7 @@ RDEPEND=" |
73 |
!sys-cluster/pmix |
74 |
dev-libs/libevent |
75 |
dev-libs/libltdl:0 |
76 |
- >=sys-apps/hwloc-1.9.1[numa?] |
77 |
+ <sys-apps/hwloc-2[numa?] |
78 |
sys-libs/zlib |
79 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
80 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
81 |
|
82 |
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild |
83 |
index e744ac73c6c..36072342535 100644 |
84 |
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild |
85 |
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild |
86 |
@@ -60,7 +60,7 @@ CDEPEND=" |
87 |
!sys-cluster/pmix |
88 |
dev-libs/libevent |
89 |
dev-libs/libltdl:0 |
90 |
- >=sys-apps/hwloc-1.9.1[numa?] |
91 |
+ <sys-apps/hwloc-2[numa?] |
92 |
sys-libs/zlib |
93 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
94 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
95 |
|
96 |
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild |
97 |
index 98a3502fcb4..3e7db1e7dfd 100644 |
98 |
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild |
99 |
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild |
100 |
@@ -60,7 +60,7 @@ CDEPEND=" |
101 |
!sys-cluster/pmix |
102 |
dev-libs/libevent |
103 |
dev-libs/libltdl:0 |
104 |
- >=sys-apps/hwloc-1.9.1[numa?] |
105 |
+ <sys-apps/hwloc-2[numa?] |
106 |
sys-libs/zlib |
107 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
108 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
109 |
|
110 |
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild |
111 |
index 89dd842faa5..4c907476d29 100644 |
112 |
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild |
113 |
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild |
114 |
@@ -55,7 +55,7 @@ CDEPEND=" |
115 |
!sys-cluster/pmix |
116 |
>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads] |
117 |
dev-libs/libltdl:0[${MULTILIB_USEDEP}] |
118 |
- >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] |
119 |
+ <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?] |
120 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
121 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) |
122 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
123 |
|
124 |
diff --git a/sys-cluster/openmpi/openmpi-2.1.5.ebuild b/sys-cluster/openmpi/openmpi-2.1.5.ebuild |
125 |
index a100f6b01ce..48a9ae2b377 100644 |
126 |
--- a/sys-cluster/openmpi/openmpi-2.1.5.ebuild |
127 |
+++ b/sys-cluster/openmpi/openmpi-2.1.5.ebuild |
128 |
@@ -51,7 +51,7 @@ CDEPEND=" |
129 |
!sys-cluster/pmix |
130 |
>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads] |
131 |
dev-libs/libltdl:0[${MULTILIB_USEDEP}] |
132 |
- >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] |
133 |
+ <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?] |
134 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
135 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) |
136 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
137 |
|
138 |
diff --git a/sys-cluster/openmpi/openmpi-3.0.2.ebuild b/sys-cluster/openmpi/openmpi-3.0.2.ebuild |
139 |
index c9ae7f37806..4143e080805 100644 |
140 |
--- a/sys-cluster/openmpi/openmpi-3.0.2.ebuild |
141 |
+++ b/sys-cluster/openmpi/openmpi-3.0.2.ebuild |
142 |
@@ -51,7 +51,7 @@ CDEPEND=" |
143 |
!sys-cluster/pmix |
144 |
>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads] |
145 |
dev-libs/libltdl:0[${MULTILIB_USEDEP}] |
146 |
- >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] |
147 |
+ <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?] |
148 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
149 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) |
150 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
151 |
|
152 |
diff --git a/sys-cluster/openmpi/openmpi-3.1.2.ebuild b/sys-cluster/openmpi/openmpi-3.1.2.ebuild |
153 |
index c9ae7f37806..4143e080805 100644 |
154 |
--- a/sys-cluster/openmpi/openmpi-3.1.2.ebuild |
155 |
+++ b/sys-cluster/openmpi/openmpi-3.1.2.ebuild |
156 |
@@ -51,7 +51,7 @@ CDEPEND=" |
157 |
!sys-cluster/pmix |
158 |
>=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads] |
159 |
dev-libs/libltdl:0[${MULTILIB_USEDEP}] |
160 |
- >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?] |
161 |
+ <sys-apps/hwloc-2[${MULTILIB_USEDEP},numa?] |
162 |
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
163 |
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) |
164 |
elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |