| 1 |
commit: 3b7788cbd1b3a0e79f1341449be1fcb4b555ef4c |
| 2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 25 01:40:27 2013 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 25 01:40:27 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3b7788cb |
| 7 |
|
| 8 |
sci-libs/armadillo: Version bump. Respect libdir |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.01.21688-prefix |
| 11 |
RepoMan-Options: --force |
| 12 |
|
| 13 |
--- |
| 14 |
sci-libs/armadillo/ChangeLog | 6 ++++++ |
| 15 |
...o-3.6.2-r1.ebuild => armadillo-3.6.3-r1.ebuild} | 7 +++---- |
| 16 |
2 files changed, 9 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog |
| 19 |
index ae5bb80..a5368dd 100644 |
| 20 |
--- a/sci-libs/armadillo/ChangeLog |
| 21 |
+++ b/sci-libs/armadillo/ChangeLog |
| 22 |
@@ -2,6 +2,12 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+*armadillo-3.6.3-r1 (25 Feb 2013) |
| 27 |
+ |
| 28 |
+ 25 Feb 2013; Sébastien Fabbro <bicatali@g.o> |
| 29 |
+ +armadillo-3.6.3-r1.ebuild, -armadillo-3.6.2-r1.ebuild: |
| 30 |
+ sci-libs/armadillo: Version bump. Respect libdir |
| 31 |
+ |
| 32 |
22 Feb 2013; Justin Lecher <jlec@g.o> armadillo-3.6.2-r1.ebuild, |
| 33 |
metadata.xml: |
| 34 |
Correct USE dependency for virtual/pkgconfig |
| 35 |
|
| 36 |
diff --git a/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild b/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild |
| 37 |
similarity index 91% |
| 38 |
rename from sci-libs/armadillo/armadillo-3.6.2-r1.ebuild |
| 39 |
rename to sci-libs/armadillo/armadillo-3.6.3-r1.ebuild |
| 40 |
index 0135614..b7bd289 100644 |
| 41 |
--- a/sci-libs/armadillo/armadillo-3.6.2-r1.ebuild |
| 42 |
+++ b/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild |
| 43 |
@@ -6,7 +6,7 @@ EAPI=5 |
| 44 |
|
| 45 |
CMAKE_IN_SOURCE_BUILD=1 |
| 46 |
|
| 47 |
-inherit cmake-utils toolchain-funcs |
| 48 |
+inherit cmake-utils toolchain-funcs multilib |
| 49 |
|
| 50 |
DESCRIPTION="Streamlined C++ linear algebra library" |
| 51 |
HOMEPAGE="http://arma.sourceforge.net/" |
| 52 |
@@ -19,7 +19,7 @@ IUSE="atlas blas doc examples lapack" |
| 53 |
|
| 54 |
RDEPEND=" |
| 55 |
dev-libs/boost |
| 56 |
- atlas? ( sci-libs/atlas ) |
| 57 |
+ atlas? ( sci-libs/atlas[lapack] ) |
| 58 |
blas? ( virtual/blas ) |
| 59 |
lapack? ( virtual/lapack )" |
| 60 |
DEPEND="${DEPEND} |
| 61 |
@@ -33,7 +33,7 @@ src_prepare() { |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
- local mycmakeargs=() |
| 66 |
+ local mycmakeargs=( -DINSTALL_LIB_DIR="${EROOT}/usr/$(get_libdir)" ) |
| 67 |
if use blas; then |
| 68 |
mycmakeargs+=( |
| 69 |
-DBLAS_FOUND=ON |
| 70 |
@@ -51,7 +51,6 @@ src_configure() { |
| 71 |
$(tc-getPKG_CONFIG) --exists atlas-cblas-threads && c+=-threads |
| 72 |
$(tc-getPKG_CONFIG) --exists atlas-lapack-threads && l+=-threads |
| 73 |
mycmakeargs=( |
| 74 |
- -DARMA_USE_ATLAS=ON |
| 75 |
-DCBLAS_FOUND=ON |
| 76 |
-DCLAPACK_FOUND=ON |
| 77 |
-DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')" |
Archives