1 |
commit: 981bdfbb5b643409f36ae16ff4400e847acb0e61 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 3 18:56:15 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 3 18:56:15 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=981bdfbb |
7 |
|
8 |
sci-libs/atlas: Version Bump |
9 |
|
10 |
Package-Manager: portage-2.2.25 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
sci-libs/atlas/atlas-3.10.1-r2.ebuild | 7 +- |
14 |
...{atlas-3.10.1-r1.ebuild => atlas-3.10.2.ebuild} | 13 +- |
15 |
...atlas-3.10.1-r1.ebuild => atlas-3.11.38.ebuild} | 70 ++++---- |
16 |
sci-libs/atlas/files/format-security.patch | 198 +++++++++++++++++++++ |
17 |
sci-libs/atlas/metadata.xml | 1 + |
18 |
5 files changed, 244 insertions(+), 45 deletions(-) |
19 |
|
20 |
diff --git a/sci-libs/atlas/atlas-3.10.1-r2.ebuild b/sci-libs/atlas/atlas-3.10.1-r2.ebuild |
21 |
index 6907b93..979f7b4 100644 |
22 |
--- a/sci-libs/atlas/atlas-3.10.1-r2.ebuild |
23 |
+++ b/sci-libs/atlas/atlas-3.10.1-r2.ebuild |
24 |
@@ -1,11 +1,12 @@ |
25 |
-# Copyright 1999-2014 Gentoo Foundation |
26 |
+# Copyright 1999-2015 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
FORTRAN_NEEDED=fortran |
33 |
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib |
34 |
+ |
35 |
+inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator |
36 |
|
37 |
LAPACKP=lapack-3.5.0.tgz |
38 |
|
39 |
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 |
40 |
LICENSE="BSD" |
41 |
SLOT="0" |
42 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
43 |
-IUSE="fortran doc generic lapack static-libs threads" |
44 |
+IUSE="doc fortran generic lapack static-libs threads" |
45 |
|
46 |
RDEPEND="" |
47 |
DEPEND="${RDEPEND}" |
48 |
|
49 |
diff --git a/sci-libs/atlas/atlas-3.10.1-r1.ebuild b/sci-libs/atlas/atlas-3.10.2.ebuild |
50 |
similarity index 95% |
51 |
copy from sci-libs/atlas/atlas-3.10.1-r1.ebuild |
52 |
copy to sci-libs/atlas/atlas-3.10.2.ebuild |
53 |
index 9f9bb29..83e3fd0 100644 |
54 |
--- a/sci-libs/atlas/atlas-3.10.1-r1.ebuild |
55 |
+++ b/sci-libs/atlas/atlas-3.10.2.ebuild |
56 |
@@ -1,13 +1,14 @@ |
57 |
-# Copyright 1999-2014 Gentoo Foundation |
58 |
+# Copyright 1999-2015 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
# $Id$ |
61 |
|
62 |
EAPI=5 |
63 |
|
64 |
FORTRAN_NEEDED=fortran |
65 |
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib |
66 |
|
67 |
-LAPACKP=lapack-3.4.2.tgz |
68 |
+inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator |
69 |
+ |
70 |
+LAPACKP=lapack-3.6.0.tgz |
71 |
|
72 |
DESCRIPTION="Automatically Tuned Linear Algebra Software" |
73 |
HOMEPAGE="http://math-atlas.sourceforge.net/" |
74 |
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 |
75 |
LICENSE="BSD" |
76 |
SLOT="0" |
77 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
78 |
-IUSE="fortran doc generic lapack static-libs threads" |
79 |
+IUSE="doc fortran generic lapack static-libs threads" |
80 |
|
81 |
RDEPEND="" |
82 |
DEPEND="${RDEPEND}" |
83 |
@@ -38,7 +39,9 @@ pkg_setup() { |
84 |
} |
85 |
|
86 |
src_prepare() { |
87 |
- epatch "${FILESDIR}"/${PN}-3.10.0-x32-support.patch |
88 |
+ epatch \ |
89 |
+ "${FILESDIR}"/${PN}-3.10.0-x32-support.patch \ |
90 |
+ "${FILESDIR}"/${P1}format-security.patch |
91 |
} |
92 |
|
93 |
src_configure() { |
94 |
|
95 |
diff --git a/sci-libs/atlas/atlas-3.10.1-r1.ebuild b/sci-libs/atlas/atlas-3.11.38.ebuild |
96 |
similarity index 85% |
97 |
rename from sci-libs/atlas/atlas-3.10.1-r1.ebuild |
98 |
rename to sci-libs/atlas/atlas-3.11.38.ebuild |
99 |
index 9f9bb29..e0e41ec 100644 |
100 |
--- a/sci-libs/atlas/atlas-3.10.1-r1.ebuild |
101 |
+++ b/sci-libs/atlas/atlas-3.11.38.ebuild |
102 |
@@ -1,13 +1,14 @@ |
103 |
-# Copyright 1999-2014 Gentoo Foundation |
104 |
+# Copyright 1999-2015 Gentoo Foundation |
105 |
# Distributed under the terms of the GNU General Public License v2 |
106 |
# $Id$ |
107 |
|
108 |
EAPI=5 |
109 |
|
110 |
FORTRAN_NEEDED=fortran |
111 |
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib |
112 |
|
113 |
-LAPACKP=lapack-3.4.2.tgz |
114 |
+inherit alternatives-2 eutils fortran-2 multilib numeric toolchain-funcs versionator |
115 |
+ |
116 |
+LAPACKP=lapack-3.6.0.tgz |
117 |
|
118 |
DESCRIPTION="Automatically Tuned Linear Algebra Software" |
119 |
HOMEPAGE="http://math-atlas.sourceforge.net/" |
120 |
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 |
121 |
LICENSE="BSD" |
122 |
SLOT="0" |
123 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
124 |
-IUSE="fortran doc generic lapack static-libs threads" |
125 |
+IUSE="doc fortran generic ifko lapack static-libs threads" |
126 |
|
127 |
RDEPEND="" |
128 |
DEPEND="${RDEPEND}" |
129 |
@@ -34,13 +35,11 @@ pkg_setup() { |
130 |
fi |
131 |
fi |
132 |
done |
133 |
+ [[ -e /sys/devices/system/cpu/intel_pstate ]] \ |
134 |
+ && die "Intel P-State driver detected. Please reboot with 'intel_pstate=disable' in your cmdline" |
135 |
use fortran && fortran-2_pkg_setup |
136 |
} |
137 |
|
138 |
-src_prepare() { |
139 |
- epatch "${FILESDIR}"/${PN}-3.10.0-x32-support.patch |
140 |
-} |
141 |
- |
142 |
src_configure() { |
143 |
# hack needed to trick the flaky gcc detection |
144 |
local mycc="$(type -P $(tc-getCC))" |
145 |
@@ -106,8 +105,9 @@ src_configure() { |
146 |
use generic && use amd64 && myconf+=( "-V 384 -A 24") |
147 |
|
148 |
local confdir="${S}_${1}"; shift |
149 |
+ myconf+=( $(usex ifko "--use-ifko" "") ) |
150 |
myconf+=( $@ ) |
151 |
- mkdir "${confdir}" && cd "${confdir}" |
152 |
+ mkdir "${confdir}" && cd "${confdir}" || die |
153 |
# for debugging |
154 |
echo ${myconf[@]} > myconf.out |
155 |
"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed" |
156 |
@@ -119,13 +119,13 @@ src_configure() { |
157 |
|
158 |
src_compile() { |
159 |
atlas_compile() { |
160 |
- pushd "${S}_${1}" > /dev/null |
161 |
+ pushd "${S}_${1}" > /dev/null || die |
162 |
# atlas does its own parallel builds |
163 |
emake -j1 build |
164 |
- cd lib |
165 |
+ cd lib || die |
166 |
emake libclapack.a |
167 |
[[ -e libptcblas.a ]] && emake libptclapack.a |
168 |
- popd > /dev/null |
169 |
+ popd > /dev/null || die |
170 |
} |
171 |
|
172 |
atlas_compile shared |
173 |
@@ -133,7 +133,7 @@ src_compile() { |
174 |
} |
175 |
|
176 |
src_test() { |
177 |
- cd "${S}_shared" |
178 |
+ cd "${S}_shared" || die |
179 |
emake -j1 check time |
180 |
} |
181 |
|
182 |
@@ -149,9 +149,8 @@ atlas_install_libs() { |
183 |
-Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \ |
184 |
"$@" -o ${soname} || die "Creating ${soname} failed" |
185 |
dolib.so ${soname} |
186 |
- ln -s ${soname} ${soname%.*} |
187 |
dosym ${soname} /usr/$(get_libdir)/${soname%.*} |
188 |
- popd > /dev/null |
189 |
+ popd > /dev/null || die |
190 |
use static-libs && dolib.a "${S}_static"/lib/${libname}.a |
191 |
} |
192 |
|
193 |
@@ -160,31 +159,28 @@ atlas_install_libs() { |
194 |
atlas_install_pc() { |
195 |
local libname=${1} ; shift |
196 |
local pcname=${1} ; shift |
197 |
- cat <<-EOF > ${pcname}.pc |
198 |
- prefix=${EPREFIX}/usr |
199 |
- libdir=\${prefix}/$(get_libdir) |
200 |
- includedir=\${prefix}/include |
201 |
- Name: ${pcname} |
202 |
- Description: ${PN} ${pcname} |
203 |
- Version: ${PV} |
204 |
- URL: ${HOMEPAGE} |
205 |
- Libs: -L\${libdir} -l${libname} $@ |
206 |
- Libs.private: -L\${libdir} -latlas -lm ${PTLIBS} |
207 |
- Cflags: -I\${includedir}/${PN} |
208 |
- ${PCREQ} |
209 |
- EOF |
210 |
- insinto /usr/$(get_libdir)/pkgconfig |
211 |
- doins ${pcname}.pc |
212 |
+ local extra=() |
213 |
+ [[ ${PCREQ} ]] && extra+=( --requires "${PCREQ}" ) |
214 |
+ create_pkgconfig \ |
215 |
+ --name "${pcname}" \ |
216 |
+ --description "${PN} ${pcname}" \ |
217 |
+ --libs "-L\${libdir} -l${libname} $@" \ |
218 |
+ --libs-private "-L\${libdir} -latlas -lm ${PTLIBS}" \ |
219 |
+ --cflags "-I\${includedir}/${PN}" \ |
220 |
+ "${extra[@]}" \ |
221 |
+ ${pcname} |
222 |
} |
223 |
|
224 |
src_install() { |
225 |
- cd "${S}_shared/lib" |
226 |
+ cd "${S}_shared/lib" ||Â die |
227 |
# rename to avoid collision with other packages |
228 |
local l |
229 |
for l in {,c}{blas,lapack}; do |
230 |
if [[ -e lib${l}.a ]]; then |
231 |
- mv lib{,atl}${l}.a |
232 |
- use static-libs && mv "${S}"_static/lib/lib{,atl}${l}.a |
233 |
+ mv lib{,atl}${l}.a || die |
234 |
+ if use static-libs; then |
235 |
+ mv "${S}"_static/lib/lib{,atl}${l}.a || die |
236 |
+ fi |
237 |
fi |
238 |
done |
239 |
|
240 |
@@ -210,7 +206,7 @@ src_install() { |
241 |
fi |
242 |
|
243 |
if use lapack; then |
244 |
- PCREQ="Requires: cblas" |
245 |
+ PCREQ="cblas" |
246 |
# clapack |
247 |
atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas |
248 |
atlas_install_pc atlclapack atlas-clapack |
249 |
@@ -240,7 +236,7 @@ src_install() { |
250 |
fi |
251 |
|
252 |
if use lapack; then |
253 |
- PCREQ="Requires: blas cblas" |
254 |
+ PCREQ="blas cblas" |
255 |
# lapack |
256 |
atlas_install_libs libatllapack.a \ |
257 |
-lm -L. -latlas -latlcblas -lf77blas |
258 |
@@ -258,11 +254,11 @@ src_install() { |
259 |
fi |
260 |
fi |
261 |
|
262 |
- cd "${S}" |
263 |
+ cd "${S}" || die |
264 |
insinto /usr/include/${PN} |
265 |
doins include/*.h |
266 |
|
267 |
- cd "${S}/doc" |
268 |
+ cd "${S}/doc" ||Â die |
269 |
dodoc INDEX.txt AtlasCredits.txt ChangeLog |
270 |
use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf |
271 |
use doc && use fortran && dodoc f77blas*pdf |
272 |
|
273 |
diff --git a/sci-libs/atlas/files/format-security.patch b/sci-libs/atlas/files/format-security.patch |
274 |
new file mode 100644 |
275 |
index 0000000..f3f45d7 |
276 |
--- /dev/null |
277 |
+++ b/sci-libs/atlas/files/format-security.patch |
278 |
@@ -0,0 +1,198 @@ |
279 |
+ bin/atlas_install.c | 46 +++++++++++++++++++++++----------------------- |
280 |
+ 1 file changed, 23 insertions(+), 23 deletions(-) |
281 |
+ |
282 |
+diff --git a/bin/atlas_install.c b/bin/atlas_install.c |
283 |
+index 2753cbf..21b716d 100644 |
284 |
+--- a/bin/atlas_install.c |
285 |
++++ b/bin/atlas_install.c |
286 |
+@@ -483,9 +483,9 @@ void PrintStartStop(FILE *fp0, FILE *fp1, int nspc, int START, int sec, |
287 |
+ fprintf(fp1, "\n\n"); |
288 |
+ } |
289 |
+ if (fp0) |
290 |
+- fprintf(fp0, ln); |
291 |
++ fprintf(fp0, "%s", ln); |
292 |
+ if (fp1) |
293 |
+- fprintf(fp1, ln); |
294 |
++ fprintf(fp1, "%s", ln); |
295 |
+ } |
296 |
+ |
297 |
+ int LnIsCont(char *ln) |
298 |
+@@ -776,11 +776,11 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
299 |
+ if (DefInstall) |
300 |
+ { |
301 |
+ sprintf(ln, "%s IRunMMDef pre=%c %s %s\n", fmake, pre, redir, ln2); |
302 |
+- fprintf(stdout, ln); |
303 |
++ fprintf(stdout, "%s", ln); |
304 |
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2); |
305 |
+ } |
306 |
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2); |
307 |
+- fprintf(stdout, ln); |
308 |
++ fprintf(stdout, "%s", ln); |
309 |
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2); |
310 |
+ PrintBanner(ln2, 0, 2, ip+1, 1); |
311 |
+ } |
312 |
+@@ -836,7 +836,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
313 |
+ if (!FileExists(fnam)) |
314 |
+ { |
315 |
+ sprintf(ln, "%s %s pre=%c %s %s", fmake, fnam, pre, redir, ln2); |
316 |
+- fprintf(stdout, ln); |
317 |
++ fprintf(stdout, "%s", ln); |
318 |
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2); |
319 |
+ } |
320 |
+ fp = fopen(fnam, "r"); |
321 |
+@@ -854,7 +854,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
322 |
+ { |
323 |
+ sprintf(ln, "%s %s pre=%c nb=%d %s %s", |
324 |
+ fmake, fnam, pre, ncnb, redir, ln2); |
325 |
+- fprintf(stdout, ln); |
326 |
++ fprintf(stdout, "%s", ln); |
327 |
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2); |
328 |
+ } |
329 |
+ GetInstLogFile(fnam, pre, &muladd, &pf, &lat, &nb, &mu, &nu, &ku, |
330 |
+@@ -881,7 +881,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
331 |
+ } |
332 |
+ |
333 |
+ sprintf(ln, "%s MMinstall pre=%c %s %s\n", fmake, pre, redir, ln2); |
334 |
+- fprintf(stdout, ln); |
335 |
++ fprintf(stdout, "%s", ln); |
336 |
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2); |
337 |
+ |
338 |
+ fprintf(fpsum, "\n"); |
339 |
+@@ -896,7 +896,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
340 |
+ PrintBanner(ln2, 1, 2, ip+1, 2); |
341 |
+ sprintf(ln, "%s INSTALL_LOG/atlas_cacheedge.h pre=%c %s %s\n", |
342 |
+ fmake, pre, redir, ln2); |
343 |
+- fprintf(stdout, ln); |
344 |
++ fprintf(stdout, "%s", ln); |
345 |
+ ATL_Cassert(system(ln)==0, "CACHEEDGE DETECTION", ln2); |
346 |
+ PrintBanner(ln2, 0, 2, ip+1, 2); |
347 |
+ } |
348 |
+@@ -922,7 +922,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
349 |
+ { |
350 |
+ sprintf(ln, "%s %s pre=%c %s %s\n", |
351 |
+ fmake, ln3, pre, redir, ln2); |
352 |
+- fprintf(stdout, ln); |
353 |
++ fprintf(stdout, "%s", ln); |
354 |
+ ATL_Cassert(system(ln)==0, "CACHEEDGE DETECTION", ln2); |
355 |
+ } |
356 |
+ fp = fopen(ln3, "r"); |
357 |
+@@ -955,7 +955,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
358 |
+ "\n\n STAGE 2-%d-3: COPY/NO-COPY CROSSOVER DETECTION\n", ip+1); |
359 |
+ |
360 |
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2); |
361 |
+- fprintf(stdout, ln); |
362 |
++ fprintf(stdout, "%s", ln); |
363 |
+ ATL_Cassert(system(ln)==0, "COPY/NO-COPY CROSSOVER DETECTION", ln2); |
364 |
+ PrintBanner(ln2, 0, 2, ip+1, 3); |
365 |
+ fprintf(stdout, " done.\n"); |
366 |
+@@ -970,17 +970,17 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
367 |
+ { |
368 |
+ sprintf(ln, "%s INSTALL_LOG/atlas_%ctrsmXover.h pre=%c %s %s\n", |
369 |
+ fmake, pre, pre, redir, ln2); |
370 |
+- fprintf(stdout, ln); |
371 |
++ fprintf(stdout, "%s", ln); |
372 |
+ ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2); |
373 |
+ } |
374 |
+ else |
375 |
+ { |
376 |
+ sprintf(ln, "%s Il3lib pre=%c %s %s\n", fmake, pre, redir, ln2); |
377 |
+- fprintf(stdout, ln); |
378 |
++ fprintf(stdout, "%s", ln); |
379 |
+ ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2); |
380 |
+ } |
381 |
+ sprintf(ln, "%s %ccblaslib %s %s\n", fmake, pre, redir, ln2); /* cblas */ |
382 |
+- fprintf(stdout, ln); |
383 |
++ fprintf(stdout, "%s", ln); |
384 |
+ ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2); |
385 |
+ PrintBanner(ln2, 0, 2, ip+1, 5); |
386 |
+ PrintStartStop(stdout, fpsum, 3, 0, 2, ip+1, 4, "L3BLAS TUNE"); |
387 |
+@@ -993,7 +993,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
388 |
+ sprintf(ln2, "INSTALL_LOG/%cMVNTUNE.LOG", pre); |
389 |
+ PrintBanner(ln2, 1, 2, ip+1, 7); |
390 |
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2); |
391 |
+- fprintf(stdout, ln); |
392 |
++ fprintf(stdout, "%s", ln); |
393 |
+ ATL_Cassert(system(ln)==0, "MVNTUNE", ln2); |
394 |
+ ATL_Cassert(FileIsThere(fnam), "MVNTUNE", ln2); |
395 |
+ PrintBanner(ln2, 0, 2, ip+1, 7); |
396 |
+@@ -1026,7 +1026,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
397 |
+ sprintf(ln2, "INSTALL_LOG/%cMVTTUNE.LOG", pre); |
398 |
+ PrintBanner(ln2, 1, 2, ip+1, 7); |
399 |
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2); |
400 |
+- fprintf(stdout, ln); |
401 |
++ fprintf(stdout, "%s", ln); |
402 |
+ ATL_Cassert(system(ln)==0, "MVTTUNE", ln2); |
403 |
+ ATL_Cassert(FileIsThere(fnam), "MVTTUNE", ln2); |
404 |
+ PrintBanner(ln2, 0, 2, ip+1, 7); |
405 |
+@@ -1061,7 +1061,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
406 |
+ sprintf(ln2, "INSTALL_LOG/%cR1TUNE.LOG", pre); |
407 |
+ PrintBanner(ln2, 1, 2, ip+1, 7); |
408 |
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2); |
409 |
+- fprintf(stdout, ln); |
410 |
++ fprintf(stdout, "%s", ln); |
411 |
+ ATL_Cassert(system(ln)==0, "R1TUNE", ln2); |
412 |
+ ATL_Cassert(FileIsThere(fnam), "R1TUNE", ln2); |
413 |
+ PrintBanner(ln2, 0, 2, ip+1, 7); |
414 |
+@@ -1099,7 +1099,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
415 |
+ sprintf(ln2, "INSTALL_LOG/LIBBUILD.LOG"); |
416 |
+ PrintBanner(ln2, 1, 3, 1, 1); |
417 |
+ sprintf(ln, "%s IBuildLibs %s %s\n", fmake, redir, ln2); |
418 |
+- fprintf(stdout, ln); |
419 |
++ fprintf(stdout, "%s", ln); |
420 |
+ ATL_Cassert(system(ln)==0, "LIBRARY BUILD", ln2); |
421 |
+ ATL_Cassert(FileIsThere(fnam), "LIBRARY BUILD", ln2); |
422 |
+ PrintBanner(ln2, 0, 3, 1, 1); |
423 |
+@@ -1110,7 +1110,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
424 |
+ PrintBanner(ln2, 1, 4, 1, 1); |
425 |
+ PrintStartStop(stdout, fpsum, 3, 1, 4, 1, 1, "TRSM TUNE"); |
426 |
+ sprintf(ln, "%s IPostTune %s %s\n", fmake, redir, ln2); |
427 |
+- fprintf(stdout, ln); |
428 |
++ fprintf(stdout, "%s", ln); |
429 |
+ ATL_Cassert(system(ln)==0, "POST-BUILD TUNE", ln2); |
430 |
+ PrintStartStop(stdout, fpsum, 3, 0, 4, 1, 0, NULL); |
431 |
+ ATL_Cassert(FileIsThere(fnam), "POST-BUILD TUNE", ln2); |
432 |
+@@ -1121,7 +1121,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
433 |
+ sprintf(ln2, "INSTALL_LOG/PTTUNE.LOG"); |
434 |
+ PrintBanner(ln2, 1, 4, 2, 0); |
435 |
+ sprintf(ln, "%s IPTtune %s %s\n", fmake, redir, ln2); |
436 |
+- fprintf(stdout, ln); |
437 |
++ fprintf(stdout, "%s", ln); |
438 |
+ ATL_Cassert(system(ln)==0, "THREADING TUNE", ln2); |
439 |
+ PrintStartStop(stdout, fpsum, 3, 0, 4, 2, 0, "THREADING TUNE"); |
440 |
+ |
441 |
+@@ -1129,7 +1129,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
442 |
+ sprintf(ln2, "INSTALL_LOG/LIBPTBUILD.LOG"); |
443 |
+ PrintBanner(ln2, 1, 4, 2, 1); |
444 |
+ sprintf(ln, "%s IBuildPtlibs %s %s\n", fmake, redir, ln2); |
445 |
+- fprintf(stdout, ln); |
446 |
++ fprintf(stdout, "%s", ln); |
447 |
+ ATL_Cassert(system(ln)==0, "PTLIBRARY BUILD", ln2); |
448 |
+ PrintBanner(ln2, 0, 4, 2, 1); |
449 |
+ PrintStartStop(stdout, fpsum, 3, 0, 4, 2, 1, "THREADING BUILD"); |
450 |
+@@ -1144,7 +1144,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
451 |
+ PrintStartStop(stdout, fpsum, 6, 1, 4, 3, ip+1, ln2); |
452 |
+ sprintf(ln2, "INSTALL_LOG/%cLATUNE.LOG", pre); |
453 |
+ PrintBanner(ln2, 1, 4, 3, ip+1); |
454 |
+- fprintf(stdout, ln); |
455 |
++ fprintf(stdout, "%s", ln); |
456 |
+ sprintf(ln, "%s ILATune pre=%c %s %s\n", fmake, pre, redir, ln2); |
457 |
+ ATL_Cassert(system(ln)==0, "LAPACK TUNE", ln2); |
458 |
+ PrintStartStop(stdout, fpsum, 6, 0, 4, 3, ip+1, NULL); |
459 |
+@@ -1162,7 +1162,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
460 |
+ #else |
461 |
+ sprintf(ln, "%s IBuildLibs %s %s\n", fmake, redir, ln2); |
462 |
+ #endif |
463 |
+- fprintf(stdout, ln); |
464 |
++ fprintf(stdout, "%s", ln); |
465 |
+ ATL_Cassert(system(ln)==0, "STATIC LIBRARY UPDATE", ln2); |
466 |
+ PrintBanner(ln2, 0, 5, 1, 1); |
467 |
+ PrintStartStop(stdout, fpsum, 3, 0, 5, 1, 0, "FINAL STATIC LIBRARY UPDATE"); |
468 |
+@@ -1172,7 +1172,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA) |
469 |
+ sprintf(ln2, "INSTALL_LOG/LIBDYBUILD.LOG"); |
470 |
+ PrintBanner(ln2, 1, 5, 2, 1); |
471 |
+ sprintf(ln, "%s IBuildDyLibs %s %s\n", fmake, redir, ln2); |
472 |
+- fprintf(stdout, ln); |
473 |
++ fprintf(stdout, "%s", ln); |
474 |
+ ATL_Cassert(system(ln)==0, "DYLIBRARY BUILD", ln2); |
475 |
+ PrintBanner(ln2, 0, 5, 2, 1); |
476 |
+ PrintStartStop(stdout, fpsum, 3, 0, 5, 2, 0, NULL); |
477 |
|
478 |
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml |
479 |
index 31d8b74..77d74d9 100644 |
480 |
--- a/sci-libs/atlas/metadata.xml |
481 |
+++ b/sci-libs/atlas/metadata.xml |
482 |
@@ -12,6 +12,7 @@ |
483 |
</longdescription> |
484 |
<use> |
485 |
<flag name="generic">Build atlas assuming a fairly generic architecture (sse2 for x86, core2 for amd64)</flag> |
486 |
+ <flag name="ifko">Use iFKO to improve ATLAS performance (ATTENTION!!! Increases builtime enormously)</flag> |
487 |
</use> |
488 |
<upstream> |
489 |
<remote-id type="sourceforge">math-atlas</remote-id> |