1 |
commit: 32f3599a4b973e447a52d25d093322b97e2af251 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 16 23:47:48 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 19 09:56:10 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=32f3599a |
7 |
|
8 |
dev-libs/intel-common: Match new variables, remove ${INTEL_SINGLE_ARCH} |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
.../intel-common/intel-common-16.0.1.150.ebuild | 137 ------------------- |
13 |
.../intel-common/intel-common-16.0.2.181.ebuild | 150 +++++++++++++++++++++ |
14 |
dev-libs/intel-common/metadata.xml | 3 + |
15 |
3 files changed, 153 insertions(+), 137 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/intel-common/intel-common-16.0.1.150.ebuild b/dev-libs/intel-common/intel-common-16.0.1.150.ebuild |
18 |
deleted file mode 100644 |
19 |
index 89a2e09..0000000 |
20 |
--- a/dev-libs/intel-common/intel-common-16.0.1.150.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,137 +0,0 @@ |
23 |
-# Copyright 1999-2016 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI=6 |
28 |
- |
29 |
-INTEL_DPN=parallel_studio_xe |
30 |
-INTEL_DID=8365 |
31 |
-INTEL_DPV=2016_update1 |
32 |
-INTEL_SUBDIR=compilers_and_libraries |
33 |
-INTEL_SINGLE_ARCH=false |
34 |
- |
35 |
-inherit intel-sdp-r1 |
36 |
- |
37 |
-DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries" |
38 |
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/" |
39 |
- |
40 |
-IUSE="+compiler doc examples mpi openmp linguas_ja" |
41 |
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" |
42 |
- |
43 |
-CHECKREQS_DISK_BUILD=375M |
44 |
- |
45 |
-INTEL_BIN_RPMS=() |
46 |
-INTEL_DAT_RPMS=( |
47 |
- "ccompxe-2016.1-056.noarch.rpm" |
48 |
- "comp-l-all-common" |
49 |
- "comp-l-all-vars" |
50 |
- "comp-l-ps-common" |
51 |
- "comp-ps-ss-doc-16.0.1-150.noarch.rpm") |
52 |
-INTEL_X86_RPMS=( |
53 |
- "comp-l-all-32" |
54 |
- "comp-l-ps-ss-wrapper") |
55 |
-INTEL_AMD64_RPMS=() |
56 |
- |
57 |
-pkg_setup() { |
58 |
- if use doc; then |
59 |
- INTEL_DAT_RPMS+=( |
60 |
- "ccompxe-doc-2016.1-056.noarch.rpm") |
61 |
- |
62 |
- if use linguas_ja; then |
63 |
- INTEL_DAT_RPMS+=( |
64 |
- "comp-ps-doc-jp-16.0.1-150.noarch.rpm") |
65 |
- fi |
66 |
- fi |
67 |
- |
68 |
- if use examples; then |
69 |
- INTEL_DAT_RPMS+=( |
70 |
- "ccomp-doc-2016.1-056.noarch.rpm") |
71 |
- fi |
72 |
- |
73 |
- if use mpi; then |
74 |
- INTEL_X86_RPMS+=( |
75 |
- "mpirt-l-ps-150-16.0.1-150.i486.rpm") |
76 |
- INTEL_AMD64_RPMS+=( |
77 |
- "mpi-psxe-056-5.1.2-056.x86_64.rpm" |
78 |
- "mpi-rt-core-150-5.1.2-150.x86_64.rpm" |
79 |
- "mpi-rt-core-150-5.1.2-150.x86_64.rpm" |
80 |
- "mpi-rt-mic-150-5.1.2-150.x86_64.rpm" |
81 |
- "mpi-sdk-core-150-5.1.2-150.x86_64.rpm" |
82 |
- "mpi-sdk-mic-150-5.1.2-150.x86_64.rpm") |
83 |
- |
84 |
- if use doc; then |
85 |
- INTEL_AMD64_RPMS+=( |
86 |
- "mpi-doc-5.1.2-150.x86_64.rpm") |
87 |
- fi |
88 |
- fi |
89 |
- |
90 |
- if use openmp; then |
91 |
- INTEL_BIN_RPMS+=( |
92 |
- "openmp-l-all" |
93 |
- "openmp-l-ps") |
94 |
- INTEL_AMD64_RPMS+=( |
95 |
- "openmp-l-ps-ss" |
96 |
- "openmp-l-ps-mic") |
97 |
- |
98 |
- if use compiler; then |
99 |
- INTEL_BIN_RPMS+=( |
100 |
- "openmp-l-all-devel") |
101 |
- INTEL_AMD64_RPMS+=( |
102 |
- "openmp-l-ps-devel" |
103 |
- "openmp-l-ps-ss-devel" |
104 |
- "openmp-l-ps-mic-devel") |
105 |
- |
106 |
- if use linguas_ja; then |
107 |
- INTEL_AMD64_RPMS+=( |
108 |
- "openmp-l-ps-devel-jp" |
109 |
- "openmp-l-ps-mic-devel-jp") |
110 |
- fi |
111 |
- fi |
112 |
- |
113 |
- if use linguas_ja; then |
114 |
- INTEL_X86_RPMS+=( |
115 |
- "openmp-l-ps-jp") |
116 |
- fi |
117 |
- fi |
118 |
- |
119 |
- if use compiler; then |
120 |
- INTEL_BIN_RPMS+=( |
121 |
- "comp-l-all-devel" |
122 |
- "comp-l-ps-ss-devel") |
123 |
- INTEL_AMD64_RPMS+=( |
124 |
- "comp-l-ps-devel") |
125 |
- fi |
126 |
- intel-sdp-r1_pkg_setup |
127 |
-} |
128 |
- |
129 |
-src_install() { |
130 |
- intel-sdp-r1_src_install |
131 |
- local path rootpath ldpath arch fenv=35intelsdp |
132 |
- cat > ${fenv} <<-EOF |
133 |
- NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N |
134 |
- INTEL_LICENSE_FILE="${EPREFIX}/opt/intel/license:${INTEL_SDP_EDIR}/licenses:" |
135 |
- EOF |
136 |
- for arch in ${INTEL_ARCH}; do |
137 |
- path=${path}:${INTEL_SDP_EDIR}/linux/bin/${arch} |
138 |
- rootpath=${rootpath}:${INTEL_SDP_EDIR}/linux/bin/${arch} |
139 |
- ldpath=${ldpath}:${INTEL_SDP_EDIR}/linux/compiler/lib/${arch} |
140 |
- done |
141 |
- if use mpi && use amd64; then |
142 |
- path=${path}:${INTEL_SDP_EDIR}/linux/mpi/intel64/bin/ |
143 |
- rootpath=${rootpath}:${INTEL_SDP_EDIR}/linux/mpi/intel64/bin/ |
144 |
- ldpath=${ldpath}:${INTEL_SDP_EDIR}/linux/mpi/intel64/lib/ |
145 |
- fi |
146 |
- cat >> ${fenv} <<-EOF |
147 |
- PATH=${path#:} |
148 |
- ROOTPATH=${rootpath#:} |
149 |
- LDPATH=${ldpath#:} |
150 |
- EOF |
151 |
- |
152 |
- doenvd ${fenv} |
153 |
- |
154 |
- cat >> "${T}"/40-${PN} <<- EOF |
155 |
- SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}" |
156 |
- EOF |
157 |
- insinto /etc/revdep-rebuild/ |
158 |
- doins "${T}"/40-${PN} |
159 |
-} |
160 |
|
161 |
diff --git a/dev-libs/intel-common/intel-common-16.0.2.181.ebuild b/dev-libs/intel-common/intel-common-16.0.2.181.ebuild |
162 |
new file mode 100644 |
163 |
index 0000000..82a1424 |
164 |
--- /dev/null |
165 |
+++ b/dev-libs/intel-common/intel-common-16.0.2.181.ebuild |
166 |
@@ -0,0 +1,150 @@ |
167 |
+# Copyright 1999-2016 Gentoo Foundation |
168 |
+# Distributed under the terms of the GNU General Public License v2 |
169 |
+# $Id$ |
170 |
+ |
171 |
+EAPI=6 |
172 |
+ |
173 |
+INTEL_DIST_SKU=8676 |
174 |
+INTEL_DIST_PV=2016_update2 |
175 |
+ |
176 |
+inherit intel-sdp-r1 |
177 |
+ |
178 |
+DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries" |
179 |
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/" |
180 |
+ |
181 |
+IUSE="+compiler doc examples mic mpi openmp linguas_ja" |
182 |
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" |
183 |
+REQUIRED_USE="mic? ( openmp )" |
184 |
+ |
185 |
+CHECKREQS_DISK_BUILD=750M |
186 |
+ |
187 |
+INTEL_DIST_BIN_RPMS=() |
188 |
+INTEL_DIST_DAT_RPMS=( |
189 |
+ "ccompxe-2016.2-062.noarch.rpm" |
190 |
+ "comp-l-all-common" |
191 |
+ "comp-l-all-vars" |
192 |
+ "comp-l-ps-common" |
193 |
+ "comp-ps-ss-doc-16.0.2-181.noarch.rpm") |
194 |
+INTEL_DIST_X86_RPMS=( |
195 |
+ "comp-l-all-32" |
196 |
+ "comp-l-ps-ss-wrapper") |
197 |
+INTEL_DIST_AMD64_RPMS=() |
198 |
+ |
199 |
+pkg_setup() { |
200 |
+ if use doc; then |
201 |
+ INTEL_DIST_DAT_RPMS+=( |
202 |
+ "ccompxe-doc-2016.2-062.noarch.rpm") |
203 |
+ |
204 |
+ if use linguas_ja; then |
205 |
+ INTEL_DIST_DAT_RPMS+=( |
206 |
+ "comp-ps-doc-jp-16.0.2-181.noarch.rpm") |
207 |
+ fi |
208 |
+ fi |
209 |
+ |
210 |
+ if use examples; then |
211 |
+ INTEL_DIST_DAT_RPMS+=( |
212 |
+ "ccomp-doc-2016.2-062.noarch.rpm") |
213 |
+ fi |
214 |
+ |
215 |
+ if use mpi; then |
216 |
+ INTEL_DIST_X86_RPMS+=( |
217 |
+ "mpirt-l-ps-181-16.0.2-181.i486.rpm") |
218 |
+ INTEL_DIST_AMD64_RPMS+=( |
219 |
+ "mpi-psxe-062-5.1.3-062.x86_64.rpm" |
220 |
+ "mpi-rt-core-181-5.1.3-181.x86_64.rpm" |
221 |
+ "mpi-sdk-core-181-5.1.3-181.x86_64.rpm" |
222 |
+ ) |
223 |
+ |
224 |
+ if use mic; then |
225 |
+ INTEL_DIST_AMD64_RPMS+=( |
226 |
+ "mpi-rt-mic-181-5.1.3-181.x86_64.rpm" |
227 |
+ "mpi-sdk-mic-181-5.1.3-181.x86_64.rpm") |
228 |
+ fi |
229 |
+ |
230 |
+ if use doc; then |
231 |
+ INTEL_DIST_AMD64_RPMS+=( |
232 |
+ "mpi-doc-5.1.3-181.x86_64.rpm") |
233 |
+ fi |
234 |
+ fi |
235 |
+ |
236 |
+ if use openmp; then |
237 |
+ INTEL_DIST_BIN_RPMS+=( |
238 |
+ "openmp-l-all" |
239 |
+ "openmp-l-ps") |
240 |
+ INTEL_DIST_AMD64_RPMS+=( |
241 |
+ "openmp-l-ps-ss") |
242 |
+ |
243 |
+ if use mic; then |
244 |
+ INTEL_DIST_AMD64_RPMS+=( |
245 |
+ "openmp-l-ps-mic") |
246 |
+ fi |
247 |
+ |
248 |
+ if use compiler; then |
249 |
+ INTEL_DIST_BIN_RPMS+=( |
250 |
+ "openmp-l-all-devel") |
251 |
+ INTEL_DIST_AMD64_RPMS+=( |
252 |
+ "openmp-l-ps-devel" |
253 |
+ "openmp-l-ps-ss-devel") |
254 |
+ |
255 |
+ if use linguas_ja; then |
256 |
+ INTEL_DIST_AMD64_RPMS+=( |
257 |
+ "openmp-l-ps-devel-jp") |
258 |
+ |
259 |
+ if use mic; then |
260 |
+ INTEL_DIST_AMD64_RPMS+=( |
261 |
+ "openmp-l-ps-mic-devel-jp") |
262 |
+ fi |
263 |
+ fi |
264 |
+ |
265 |
+ if use mic; then |
266 |
+ INTEL_DIST_AMD64_RPMS+=( |
267 |
+ "openmp-l-ps-mic-devel") |
268 |
+ fi |
269 |
+ fi |
270 |
+ |
271 |
+ if use linguas_ja; then |
272 |
+ INTEL_DIST_X86_RPMS+=( |
273 |
+ "openmp-l-ps-jp") |
274 |
+ fi |
275 |
+ fi |
276 |
+ |
277 |
+ if use compiler; then |
278 |
+ INTEL_DIST_BIN_RPMS+=( |
279 |
+ "comp-l-all-devel" |
280 |
+ "comp-l-ps-ss-devel") |
281 |
+ INTEL_DIST_AMD64_RPMS+=( |
282 |
+ "comp-l-ps-devel") |
283 |
+ fi |
284 |
+} |
285 |
+ |
286 |
+src_install() { |
287 |
+ intel-sdp-r1_src_install |
288 |
+ local path rootpath ldpath arch fenv=35intelsdp |
289 |
+ cat > ${fenv} <<-EOF |
290 |
+ NLSPATH=$(isdp_get-sdp-edir)/linux/compiler/lib/$(isdp_get-native-abi-arch)/locale/en_US/%N |
291 |
+ INTEL_LICENSE_FILE=${EPREFIX%/}/opt/intel/licenses:$(isdp_get-sdp-edir)/licenses |
292 |
+ EOF |
293 |
+ for arch in $(isdp_get-sdp-installed-arches); do |
294 |
+ path="${path}:$(isdp_get-sdp-edir)/linux/bin/${arch}" |
295 |
+ rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/bin/${arch}" |
296 |
+ ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/compiler/lib/${arch}" |
297 |
+ done |
298 |
+ if use mpi && use amd64; then |
299 |
+ path="${path}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" |
300 |
+ rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" |
301 |
+ ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/lib/" |
302 |
+ fi |
303 |
+ cat >> ${fenv} <<-EOF |
304 |
+ PATH=${path#:} |
305 |
+ ROOTPATH=${rootpath#:} |
306 |
+ LDPATH=${ldpath#:} |
307 |
+ EOF |
308 |
+ |
309 |
+ doenvd ${fenv} |
310 |
+ |
311 |
+ cat >> "${T}"/40-${PN} <<- EOF |
312 |
+ SEARCH_DIRS_MASK=$(isdp_get-sdp-edir) |
313 |
+ EOF |
314 |
+ insinto /etc/revdep-rebuild/ |
315 |
+ doins "${T}"/40-${PN} |
316 |
+} |
317 |
|
318 |
diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml |
319 |
index 7e7298d..b4d319f 100644 |
320 |
--- a/dev-libs/intel-common/metadata.xml |
321 |
+++ b/dev-libs/intel-common/metadata.xml |
322 |
@@ -12,4 +12,7 @@ |
323 |
<use> |
324 |
<flag name="compiler">Install the libraries needed for the icc and ifort compilers</flag> |
325 |
</use> |
326 |
+ <use> |
327 |
+ <flag name="mic">Install the libraries needed for supporting Intel Many Integrated Core (Xeon Phi)</flag> |
328 |
+ </use> |
329 |
</pkgmetadata> |