| 1 |
commit: bc62393734cd89341610c14c14f61abe8d478f86 |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 10 01:55:26 2014 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 10 01:55:26 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bc623937 |
| 7 |
|
| 8 |
sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.8-prefix |
| 11 |
|
| 12 |
--- |
| 13 |
sci-libs/armadillo/ChangeLog | 3 +++ |
| 14 |
sci-libs/armadillo/armadillo-4.000.3.ebuild | 33 +++++++++++++++++------------ |
| 15 |
2 files changed, 22 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog |
| 18 |
index 59c557d..e28dc78 100644 |
| 19 |
--- a/sci-libs/armadillo/ChangeLog |
| 20 |
+++ b/sci-libs/armadillo/ChangeLog |
| 21 |
@@ -2,6 +2,9 @@ |
| 22 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 23 |
# $Header: $ |
| 24 |
|
| 25 |
+ 10 Feb 2014; Sébastien Fabbro <bicatali@g.o> armadillo-4.000.3.ebuild: |
| 26 |
+ sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time |
| 27 |
+ |
| 28 |
09 Feb 2014; Sébastien Fabbro <bicatali@g.o> metadata.xml: |
| 29 |
sci-libs/armadillo: add use flag description |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild |
| 33 |
index 7b82540..6dab248 100644 |
| 34 |
--- a/sci-libs/armadillo/armadillo-4.000.3.ebuild |
| 35 |
+++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild |
| 36 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" |
| 37 |
LICENSE="MPL-2.0" |
| 38 |
SLOT="0/4" |
| 39 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 40 |
-IUSE="arpack atlas blas debug doc examples hdf5 int64 lapack mkl tbb test" |
| 41 |
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" |
| 42 |
REQUIRED_USE="test? ( lapack )" |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
@@ -49,7 +49,6 @@ src_configure() { |
| 46 |
local mycmakeargs=( |
| 47 |
-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
| 48 |
$(cmake-utils_use debug ARMA_EXTRA_DEBUG) |
| 49 |
- $(cmake-utils_use int64 ARMA_64BIT_WORD) |
| 50 |
$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) |
| 51 |
$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) |
| 52 |
) |
| 53 |
@@ -59,18 +58,6 @@ src_configure() { |
| 54 |
-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
| 55 |
) |
| 56 |
fi |
| 57 |
- if use blas; then |
| 58 |
- mycmakeargs+=( |
| 59 |
- -DBLAS_FOUND=ON |
| 60 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
| 61 |
- ) |
| 62 |
- fi |
| 63 |
- if use lapack; then |
| 64 |
- mycmakeargs+=( |
| 65 |
- -DLAPACK_FOUND=ON |
| 66 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
| 67 |
- ) |
| 68 |
- fi |
| 69 |
if use atlas; then |
| 70 |
local c=atlas-cblas l=atlas-clapack |
| 71 |
$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
| 72 |
@@ -84,6 +71,24 @@ src_configure() { |
| 73 |
-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
| 74 |
) |
| 75 |
fi |
| 76 |
+ if use blas; then |
| 77 |
+ mycmakeargs+=( |
| 78 |
+ -DBLAS_FOUND=ON |
| 79 |
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
| 80 |
+ ) |
| 81 |
+ fi |
| 82 |
+ if use hdf5; then |
| 83 |
+ mycmakeargs+=( |
| 84 |
+ -DHDF5_FOUND=ON |
| 85 |
+ -DHDF5_LIBRARIES="-lhdf5" |
| 86 |
+ ) |
| 87 |
+ fi |
| 88 |
+ if use lapack; then |
| 89 |
+ mycmakeargs+=( |
| 90 |
+ -DLAPACK_FOUND=ON |
| 91 |
+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
| 92 |
+ ) |
| 93 |
+ fi |
| 94 |
cmake-utils_src_configure |
| 95 |
} |
Archives