Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/
Date: Sun, 16 Apr 2017 14:13:04
Message-Id: 1492351914.3ee1770ad00177804b7c4a712606ae7dcd0abfba.dilfridge@gentoo
1 commit: 3ee1770ad00177804b7c4a712606ae7dcd0abfba
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 16 13:57:38 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 16 14:11:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee1770a
7
8 sci-libs/armadillo: Re-enable superlu support
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 sci-libs/armadillo/armadillo-7.800.2.ebuild | 25 ++++++++++++-------------
13 1 file changed, 12 insertions(+), 13 deletions(-)
14
15 diff --git a/sci-libs/armadillo/armadillo-7.800.2.ebuild b/sci-libs/armadillo/armadillo-7.800.2.ebuild
16 index 94954c6a1d6..ad912b34eea 100644
17 --- a/sci-libs/armadillo/armadillo-7.800.2.ebuild
18 +++ b/sci-libs/armadillo/armadillo-7.800.2.ebuild
19 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
20 LICENSE="Apache-2.0"
21 SLOT="0/7"
22 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
23 -IUSE="arpack blas debug doc examples hdf5 lapack mkl tbb test"
24 +IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
25 REQUIRED_USE="test? ( lapack )"
26
27 RDEPEND="
28 @@ -22,9 +22,8 @@ RDEPEND="
29 arpack? ( sci-libs/arpack )
30 blas? ( virtual/blas )
31 lapack? ( virtual/lapack )
32 + superlu? ( >=sci-libs/superlu-5 )
33 "
34 -# superlu? ( sci-libs/superlu )
35 -# needs superlu-5
36
37 DEPEND="${RDEPEND}
38 arpack? ( virtual/pkgconfig )
39 @@ -104,16 +103,16 @@ src_configure() {
40 -DLAPACK_FOUND=OFF
41 )
42 fi
43 -# if use superlu; then
44 -# mycmakeargs+=(
45 -# -DSuperLU_FOUND=ON
46 -# -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
47 -# )
48 -# else
49 -# mycmakeargs+=(
50 -# -DSuperLU_FOUND=OFF
51 -# )
52 -# fi
53 + if use superlu; then
54 + mycmakeargs+=(
55 + -DSuperLU_FOUND=ON
56 + -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
57 + )
58 + else
59 + mycmakeargs+=(
60 + -DSuperLU_FOUND=OFF
61 + )
62 + fi
63
64 cmake-utils_src_configure
65 }