1 |
commit: a9192fe70e3153d30c92244fcb5b9a454cec57c7 |
2 |
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 27 13:14:06 2015 +0000 |
4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 27 13:14:06 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a9192fe7 |
7 |
|
8 |
Remove old |
9 |
|
10 |
Package-Manager: portage-2.2.14 |
11 |
|
12 |
--- |
13 |
sci-libs/armadillo/ChangeLog | 6 ++ |
14 |
sci-libs/armadillo/armadillo-4.200.0.ebuild | 114 --------------------- |
15 |
sci-libs/armadillo/armadillo-4.300.8.ebuild | 114 --------------------- |
16 |
sci-libs/armadillo/armadillo-4.300.9.ebuild | 114 --------------------- |
17 |
.../files/armadillo-3.820.1-example-makefile.patch | 33 ------ |
18 |
.../armadillo/files/armadillo-4.000.3-hdf5.patch | 19 ---- |
19 |
6 files changed, 6 insertions(+), 394 deletions(-) |
20 |
|
21 |
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog |
22 |
index 51b024f..1d21d03 100644 |
23 |
--- a/sci-libs/armadillo/ChangeLog |
24 |
+++ b/sci-libs/armadillo/ChangeLog |
25 |
@@ -2,6 +2,12 @@ |
26 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
27 |
# $Header: $ |
28 |
|
29 |
+ 27 Feb 2015; Andreas K. Huettel <dilfridge@g.o> |
30 |
+ -armadillo-4.200.0.ebuild, -armadillo-4.300.8.ebuild, |
31 |
+ -armadillo-4.300.9.ebuild, -files/armadillo-3.820.1-example-makefile.patch, |
32 |
+ -files/armadillo-4.000.3-hdf5.patch: |
33 |
+ Remove old |
34 |
+ |
35 |
*armadillo-4.600.4 (27 Jan 2015) |
36 |
|
37 |
27 Jan 2015; Marius Brehler <marbre@××××××××××××××.de> |
38 |
|
39 |
diff --git a/sci-libs/armadillo/armadillo-4.200.0.ebuild b/sci-libs/armadillo/armadillo-4.200.0.ebuild |
40 |
deleted file mode 100644 |
41 |
index 6dab248..0000000 |
42 |
--- a/sci-libs/armadillo/armadillo-4.200.0.ebuild |
43 |
+++ /dev/null |
44 |
@@ -1,114 +0,0 @@ |
45 |
-# Copyright 1999-2014 Gentoo Foundation |
46 |
-# Distributed under the terms of the GNU General Public License v2 |
47 |
-# $Header: $ |
48 |
- |
49 |
-EAPI=5 |
50 |
- |
51 |
-CMAKE_IN_SOURCE_BUILD=1 |
52 |
- |
53 |
-inherit cmake-utils toolchain-funcs multilib eutils |
54 |
- |
55 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
56 |
-HOMEPAGE="http://arma.sourceforge.net/" |
57 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" |
58 |
- |
59 |
-LICENSE="MPL-2.0" |
60 |
-SLOT="0/4" |
61 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
62 |
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" |
63 |
-REQUIRED_USE="test? ( lapack )" |
64 |
- |
65 |
-RDEPEND=" |
66 |
- dev-libs/boost |
67 |
- arpack? ( sci-libs/arpack ) |
68 |
- atlas? ( sci-libs/atlas[lapack] ) |
69 |
- blas? ( virtual/blas ) |
70 |
- lapack? ( virtual/lapack )" |
71 |
-DEPEND="${RDEPEND} |
72 |
- arpack? ( virtual/pkgconfig ) |
73 |
- atlas? ( virtual/pkgconfig ) |
74 |
- blas? ( virtual/pkgconfig ) |
75 |
- hdf5? ( sci-libs/hdf5 ) |
76 |
- lapack? ( virtual/pkgconfig ) |
77 |
- mkl? ( sci-libs/mkl ) |
78 |
- tbb? ( dev-cpp/tbb )" |
79 |
-PDEPEND="${RDEPEND} |
80 |
- hdf5? ( sci-libs/hdf5 ) |
81 |
- mkl? ( sci-libs/mkl ) |
82 |
- tbb? ( dev-cpp/tbb )" |
83 |
- |
84 |
-src_prepare() { |
85 |
- epatch \ |
86 |
- "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \ |
87 |
- "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch |
88 |
- # avoid the automagic cmake macros |
89 |
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die |
90 |
-} |
91 |
- |
92 |
-src_configure() { |
93 |
- local mycmakeargs=( |
94 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
95 |
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG) |
96 |
- $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) |
97 |
- $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) |
98 |
- ) |
99 |
- if use arpack; then |
100 |
- mycmakeargs+=( |
101 |
- -DARPACK_FOUND=ON |
102 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
103 |
- ) |
104 |
- fi |
105 |
- if use atlas; then |
106 |
- local c=atlas-cblas l=atlas-clapack |
107 |
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
108 |
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
109 |
- mycmakeargs+=( |
110 |
- -DCBLAS_FOUND=ON |
111 |
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
112 |
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
113 |
- -DCLAPACK_FOUND=ON |
114 |
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
115 |
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
116 |
- ) |
117 |
- fi |
118 |
- if use blas; then |
119 |
- mycmakeargs+=( |
120 |
- -DBLAS_FOUND=ON |
121 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
122 |
- ) |
123 |
- fi |
124 |
- if use hdf5; then |
125 |
- mycmakeargs+=( |
126 |
- -DHDF5_FOUND=ON |
127 |
- -DHDF5_LIBRARIES="-lhdf5" |
128 |
- ) |
129 |
- fi |
130 |
- if use lapack; then |
131 |
- mycmakeargs+=( |
132 |
- -DLAPACK_FOUND=ON |
133 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
134 |
- ) |
135 |
- fi |
136 |
- cmake-utils_src_configure |
137 |
-} |
138 |
- |
139 |
-src_test() { |
140 |
- pushd examples > /dev/null |
141 |
- emake \ |
142 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
143 |
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" |
144 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
145 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die |
146 |
- emake clean |
147 |
- popd > /dev/null |
148 |
-} |
149 |
- |
150 |
-src_install() { |
151 |
- cmake-utils_src_install |
152 |
- dodoc README.txt |
153 |
- use doc && dodoc *pdf && dohtml *html |
154 |
- if use examples; then |
155 |
- insinto /usr/share/doc/${PF} |
156 |
- doins -r examples |
157 |
- fi |
158 |
-} |
159 |
|
160 |
diff --git a/sci-libs/armadillo/armadillo-4.300.8.ebuild b/sci-libs/armadillo/armadillo-4.300.8.ebuild |
161 |
deleted file mode 100644 |
162 |
index 96ac582..0000000 |
163 |
--- a/sci-libs/armadillo/armadillo-4.300.8.ebuild |
164 |
+++ /dev/null |
165 |
@@ -1,114 +0,0 @@ |
166 |
-# Copyright 1999-2014 Gentoo Foundation |
167 |
-# Distributed under the terms of the GNU General Public License v2 |
168 |
-# $Header: $ |
169 |
- |
170 |
-EAPI=5 |
171 |
- |
172 |
-CMAKE_IN_SOURCE_BUILD=1 |
173 |
- |
174 |
-inherit cmake-utils toolchain-funcs multilib eutils |
175 |
- |
176 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
177 |
-HOMEPAGE="http://arma.sourceforge.net/" |
178 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" |
179 |
- |
180 |
-LICENSE="MPL-2.0" |
181 |
-SLOT="0/4" |
182 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
183 |
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" |
184 |
-REQUIRED_USE="test? ( lapack )" |
185 |
- |
186 |
-RDEPEND=" |
187 |
- dev-libs/boost |
188 |
- arpack? ( sci-libs/arpack ) |
189 |
- atlas? ( sci-libs/atlas[lapack] ) |
190 |
- blas? ( virtual/blas ) |
191 |
- lapack? ( virtual/lapack )" |
192 |
-DEPEND="${RDEPEND} |
193 |
- arpack? ( virtual/pkgconfig ) |
194 |
- atlas? ( virtual/pkgconfig ) |
195 |
- blas? ( virtual/pkgconfig ) |
196 |
- hdf5? ( sci-libs/hdf5 ) |
197 |
- lapack? ( virtual/pkgconfig ) |
198 |
- mkl? ( sci-libs/mkl ) |
199 |
- tbb? ( dev-cpp/tbb )" |
200 |
-PDEPEND="${RDEPEND} |
201 |
- hdf5? ( sci-libs/hdf5 ) |
202 |
- mkl? ( sci-libs/mkl ) |
203 |
- tbb? ( dev-cpp/tbb )" |
204 |
- |
205 |
-PATCHES=( "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch ) |
206 |
- |
207 |
-src_prepare() { |
208 |
- # avoid the automagic cmake macros |
209 |
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die |
210 |
- cmake-utils_src_prepare |
211 |
-} |
212 |
- |
213 |
-src_configure() { |
214 |
- local mycmakeargs=( |
215 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
216 |
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG) |
217 |
- $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) |
218 |
- $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) |
219 |
- ) |
220 |
- if use arpack; then |
221 |
- mycmakeargs+=( |
222 |
- -DARPACK_FOUND=ON |
223 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
224 |
- ) |
225 |
- fi |
226 |
- if use atlas; then |
227 |
- local c=atlas-cblas l=atlas-clapack |
228 |
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
229 |
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
230 |
- mycmakeargs+=( |
231 |
- -DCBLAS_FOUND=ON |
232 |
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
233 |
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
234 |
- -DCLAPACK_FOUND=ON |
235 |
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
236 |
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
237 |
- ) |
238 |
- fi |
239 |
- if use blas; then |
240 |
- mycmakeargs+=( |
241 |
- -DBLAS_FOUND=ON |
242 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
243 |
- ) |
244 |
- fi |
245 |
- if use hdf5; then |
246 |
- mycmakeargs+=( |
247 |
- -DHDF5_FOUND=ON |
248 |
- -DHDF5_LIBRARIES="-lhdf5" |
249 |
- ) |
250 |
- fi |
251 |
- if use lapack; then |
252 |
- mycmakeargs+=( |
253 |
- -DLAPACK_FOUND=ON |
254 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
255 |
- ) |
256 |
- fi |
257 |
- cmake-utils_src_configure |
258 |
-} |
259 |
- |
260 |
-src_test() { |
261 |
- pushd examples > /dev/null |
262 |
- emake \ |
263 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
264 |
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" |
265 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
266 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die |
267 |
- emake clean |
268 |
- popd > /dev/null |
269 |
-} |
270 |
- |
271 |
-src_install() { |
272 |
- cmake-utils_src_install |
273 |
- dodoc README.txt |
274 |
- use doc && dodoc *pdf && dohtml *html |
275 |
- if use examples; then |
276 |
- insinto /usr/share/doc/${PF} |
277 |
- doins -r examples |
278 |
- fi |
279 |
-} |
280 |
|
281 |
diff --git a/sci-libs/armadillo/armadillo-4.300.9.ebuild b/sci-libs/armadillo/armadillo-4.300.9.ebuild |
282 |
deleted file mode 100644 |
283 |
index 96ac582..0000000 |
284 |
--- a/sci-libs/armadillo/armadillo-4.300.9.ebuild |
285 |
+++ /dev/null |
286 |
@@ -1,114 +0,0 @@ |
287 |
-# Copyright 1999-2014 Gentoo Foundation |
288 |
-# Distributed under the terms of the GNU General Public License v2 |
289 |
-# $Header: $ |
290 |
- |
291 |
-EAPI=5 |
292 |
- |
293 |
-CMAKE_IN_SOURCE_BUILD=1 |
294 |
- |
295 |
-inherit cmake-utils toolchain-funcs multilib eutils |
296 |
- |
297 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
298 |
-HOMEPAGE="http://arma.sourceforge.net/" |
299 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" |
300 |
- |
301 |
-LICENSE="MPL-2.0" |
302 |
-SLOT="0/4" |
303 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
304 |
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" |
305 |
-REQUIRED_USE="test? ( lapack )" |
306 |
- |
307 |
-RDEPEND=" |
308 |
- dev-libs/boost |
309 |
- arpack? ( sci-libs/arpack ) |
310 |
- atlas? ( sci-libs/atlas[lapack] ) |
311 |
- blas? ( virtual/blas ) |
312 |
- lapack? ( virtual/lapack )" |
313 |
-DEPEND="${RDEPEND} |
314 |
- arpack? ( virtual/pkgconfig ) |
315 |
- atlas? ( virtual/pkgconfig ) |
316 |
- blas? ( virtual/pkgconfig ) |
317 |
- hdf5? ( sci-libs/hdf5 ) |
318 |
- lapack? ( virtual/pkgconfig ) |
319 |
- mkl? ( sci-libs/mkl ) |
320 |
- tbb? ( dev-cpp/tbb )" |
321 |
-PDEPEND="${RDEPEND} |
322 |
- hdf5? ( sci-libs/hdf5 ) |
323 |
- mkl? ( sci-libs/mkl ) |
324 |
- tbb? ( dev-cpp/tbb )" |
325 |
- |
326 |
-PATCHES=( "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch ) |
327 |
- |
328 |
-src_prepare() { |
329 |
- # avoid the automagic cmake macros |
330 |
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die |
331 |
- cmake-utils_src_prepare |
332 |
-} |
333 |
- |
334 |
-src_configure() { |
335 |
- local mycmakeargs=( |
336 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
337 |
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG) |
338 |
- $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) |
339 |
- $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) |
340 |
- ) |
341 |
- if use arpack; then |
342 |
- mycmakeargs+=( |
343 |
- -DARPACK_FOUND=ON |
344 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
345 |
- ) |
346 |
- fi |
347 |
- if use atlas; then |
348 |
- local c=atlas-cblas l=atlas-clapack |
349 |
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
350 |
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
351 |
- mycmakeargs+=( |
352 |
- -DCBLAS_FOUND=ON |
353 |
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
354 |
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
355 |
- -DCLAPACK_FOUND=ON |
356 |
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
357 |
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
358 |
- ) |
359 |
- fi |
360 |
- if use blas; then |
361 |
- mycmakeargs+=( |
362 |
- -DBLAS_FOUND=ON |
363 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
364 |
- ) |
365 |
- fi |
366 |
- if use hdf5; then |
367 |
- mycmakeargs+=( |
368 |
- -DHDF5_FOUND=ON |
369 |
- -DHDF5_LIBRARIES="-lhdf5" |
370 |
- ) |
371 |
- fi |
372 |
- if use lapack; then |
373 |
- mycmakeargs+=( |
374 |
- -DLAPACK_FOUND=ON |
375 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
376 |
- ) |
377 |
- fi |
378 |
- cmake-utils_src_configure |
379 |
-} |
380 |
- |
381 |
-src_test() { |
382 |
- pushd examples > /dev/null |
383 |
- emake \ |
384 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
385 |
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" |
386 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
387 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die |
388 |
- emake clean |
389 |
- popd > /dev/null |
390 |
-} |
391 |
- |
392 |
-src_install() { |
393 |
- cmake-utils_src_install |
394 |
- dodoc README.txt |
395 |
- use doc && dodoc *pdf && dohtml *html |
396 |
- if use examples; then |
397 |
- insinto /usr/share/doc/${PF} |
398 |
- doins -r examples |
399 |
- fi |
400 |
-} |
401 |
|
402 |
diff --git a/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch b/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch |
403 |
deleted file mode 100644 |
404 |
index 90169ed..0000000 |
405 |
--- a/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch |
406 |
+++ /dev/null |
407 |
@@ -1,33 +0,0 @@ |
408 |
---- examples/Makefile.cmake.orig 2013-04-29 09:13:58.164963641 -0700 |
409 |
-+++ examples/Makefile.cmake 2013-04-29 09:18:42.371460644 -0700 |
410 |
-@@ -1,7 +1,7 @@ |
411 |
- # The generated "Makefile" from "Makefile.cmake" is only usable after |
412 |
- # the Armadillo library has been configured and installed by CMake. |
413 |
- |
414 |
--CXX=g++ |
415 |
-+CXX:=g++ |
416 |
- #CXX=g++-4.2 |
417 |
- ## Under MacOS you may have an old compiler as default (e.g. GCC 4.0). |
418 |
- ## However, GCC 4.2 or later is available and preferable due to better |
419 |
-@@ -26,7 +26,7 @@ |
420 |
- |
421 |
- |
422 |
- |
423 |
--LIB_FLAGS = -larmadillo $(EXTRA_LIB_FLAGS) |
424 |
-+LIB_FLAGS = $(EXTRA_LIB_FLAGS) -larmadillo |
425 |
- ## NOTE: on Ubuntu and Debian based systems you may need to add |
426 |
- ## -lgfortran to LIB_FLAGS |
427 |
- |
428 |
-@@ -73,10 +73,10 @@ |
429 |
- all: example1 example2 |
430 |
- |
431 |
- example1: example1.cpp |
432 |
-- $(CXX) $(CXXFLAGS) -o $@ $< $(LIB_FLAGS) |
433 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_FLAGS) -o $@ |
434 |
- |
435 |
- example2: example2.cpp |
436 |
-- $(CXX) $(CXXFLAGS) -o $@ $< $(LIB_FLAGS) |
437 |
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_FLAGS) -o $@ |
438 |
- |
439 |
- |
440 |
- .PHONY: clean |
441 |
|
442 |
diff --git a/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch b/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch |
443 |
deleted file mode 100644 |
444 |
index 4510cd8..0000000 |
445 |
--- a/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch |
446 |
+++ /dev/null |
447 |
@@ -1,19 +0,0 @@ |
448 |
---- armadillo-4.000.2/CMakeLists.txt.orig 2014-02-03 14:47:35.023255183 -0800 |
449 |
-+++ armadillo-4.000.2/CMakeLists.txt 2014-02-03 21:19:47.567376544 -0800 |
450 |
-@@ -227,11 +227,11 @@ |
451 |
- # find_package(HDF5) |
452 |
- # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") |
453 |
- # |
454 |
--# if(HDF5_FOUND) |
455 |
--# set(ARMA_USE_HDF5 true) |
456 |
--# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) |
457 |
--# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) |
458 |
--# endif() |
459 |
-+if(HDF5_FOUND) |
460 |
-+ set(ARMA_USE_HDF5 true) |
461 |
-+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) |
462 |
-+ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) |
463 |
-+ endif() |
464 |
- |
465 |
- |
466 |
- include(ARMA_FindARPACK) |