1 |
commit: bee27eb73a8e814c4229806988697c990ad4599d |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 29 00:04:06 2012 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 29 00:04:06 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bee27eb7 |
7 |
|
8 |
sci-libs/lapacke-reference: added tmg for testing, cleaning up ebuild |
9 |
|
10 |
Package-Manager: portage-2.2.01.21313-prefix |
11 |
|
12 |
--- |
13 |
sci-libs/lapacke-reference/ChangeLog | 4 + |
14 |
.../lapacke-reference-3.4.1.ebuild | 77 -------------------- |
15 |
.../lapacke-reference-3.4.2.ebuild | 16 +++-- |
16 |
sci-libs/lapacke-reference/metadata.xml | 12 ++-- |
17 |
4 files changed, 21 insertions(+), 88 deletions(-) |
18 |
|
19 |
diff --git a/sci-libs/lapacke-reference/ChangeLog b/sci-libs/lapacke-reference/ChangeLog |
20 |
index c82c7a1..a26b128 100644 |
21 |
--- a/sci-libs/lapacke-reference/ChangeLog |
22 |
+++ b/sci-libs/lapacke-reference/ChangeLog |
23 |
@@ -2,6 +2,10 @@ |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: $ |
26 |
|
27 |
+ 29 Nov 2012; Sébastien Fabbro <bicatali@g.o> |
28 |
+ -lapacke-reference-3.4.1.ebuild, lapacke-reference-3.4.2.ebuild, metadata.xml: |
29 |
+ sci-libs/lapacke-reference: added tmg for testing, cleaning up ebuild |
30 |
+ |
31 |
*lapacke-reference-3.4.2 (26 Oct 2012) |
32 |
|
33 |
26 Oct 2012; Sébastien Fabbro <bicatali@g.o> |
34 |
|
35 |
diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild |
36 |
deleted file mode 100644 |
37 |
index b9ab447..0000000 |
38 |
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,77 +0,0 @@ |
41 |
-# Copyright 1999-2012 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
-# $Header: $ |
44 |
- |
45 |
-EAPI=4 |
46 |
- |
47 |
-inherit alternatives-2 cmake-utils eutils fortran-2 |
48 |
- |
49 |
-MYP=lapack-${PV} |
50 |
- |
51 |
-DESCRIPTION="C Interface to LAPACK" |
52 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
53 |
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz" |
54 |
- |
55 |
-LICENSE="BSD" |
56 |
-SLOT="0" |
57 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
58 |
-IUSE="static-libs test xblas" |
59 |
- |
60 |
-RDEPEND=" |
61 |
- virtual/blas |
62 |
- virtual/lapack |
63 |
- xblas? ( sci-libs/xblas )" |
64 |
-DEPEND="${RDEPEND} |
65 |
- test? ( virtual/fortran ) |
66 |
- dev-util/pkgconfig" |
67 |
- |
68 |
-S="${WORKDIR}/${MYP}" |
69 |
- |
70 |
-src_prepare() { |
71 |
- epatch "${FILESDIR}"/${MYP}-cmake.patch |
72 |
- use static-libs && mkdir "${WORKDIR}/${PN}_static" |
73 |
-} |
74 |
- |
75 |
-src_configure() { |
76 |
- lapack_configure() { |
77 |
- local mycmakeargs=( |
78 |
- -DUSE_OPTIMIZED_BLAS=ON |
79 |
- -DUSE_OPTIMIZED_LAPACK=ON |
80 |
- -DLAPACKE=ON |
81 |
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)" |
82 |
- -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" |
83 |
- $(cmake-utils_use_build test TESTING) |
84 |
- $(cmake-utils_use_use xblas XBLAS) |
85 |
- $@ |
86 |
- ) |
87 |
- cmake-utils_src_configure |
88 |
- } |
89 |
- |
90 |
- lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF |
91 |
- use static-libs && \ |
92 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \ |
93 |
- -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON |
94 |
-} |
95 |
- |
96 |
-src_compile() { |
97 |
- use test && cmake-utils_src_compile -C TESTING/MATGEN |
98 |
- cmake-utils_src_compile -C lapacke |
99 |
- use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \ |
100 |
- cmake-utils_src_compile -C lapacke |
101 |
-} |
102 |
- |
103 |
-src_test() { |
104 |
- pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null |
105 |
- local ctestargs |
106 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
107 |
- ctest ${ctestargs} || die |
108 |
- popd > /dev/null |
109 |
-} |
110 |
- |
111 |
-src_install() { |
112 |
- cmake-utils_src_install -C lapacke |
113 |
- use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \ |
114 |
- cmake-utils_src_install -C lapacke |
115 |
- alternatives_for lapacke reference 0 \ |
116 |
- /usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc |
117 |
-} |
118 |
|
119 |
diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild |
120 |
index 07c6fc0..f8224d4 100644 |
121 |
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild |
122 |
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild |
123 |
@@ -4,7 +4,9 @@ |
124 |
|
125 |
EAPI=4 |
126 |
|
127 |
-inherit alternatives-2 cmake-utils eutils fortran-2 |
128 |
+inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs |
129 |
+ |
130 |
+FORTRAN_NEEDED=test |
131 |
|
132 |
MYP=lapack-${PV} |
133 |
|
134 |
@@ -15,14 +17,14 @@ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz" |
135 |
LICENSE="BSD" |
136 |
SLOT="0" |
137 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
138 |
-IUSE="static-libs test xblas" |
139 |
+IUSE="static-libs test tmg xblas" |
140 |
|
141 |
RDEPEND=" |
142 |
virtual/blas |
143 |
virtual/lapack |
144 |
+ tmg? ( sci-libs/tmglib ) |
145 |
xblas? ( sci-libs/xblas )" |
146 |
DEPEND="${RDEPEND} |
147 |
- test? ( virtual/fortran ) |
148 |
virtual/pkgconfig" |
149 |
|
150 |
S="${WORKDIR}/${MYP}" |
151 |
@@ -41,8 +43,9 @@ src_prepare() { |
152 |
sed -i \ |
153 |
-e 's:lapacke:reflapacke:g' \ |
154 |
lapacke/example/CMakeLists.txt || die |
155 |
+ local tmgpc; use tmg && tmgpc=" -ltmglib" |
156 |
sed -i \ |
157 |
- -e 's:-llapacke:-lreflapacke:g' \ |
158 |
+ -e "s:-llapacke:-lreflapacke${tmgpc}:g" \ |
159 |
lapacke/lapacke.pc.in || die |
160 |
use static-libs && mkdir "${WORKDIR}/${PN}_static" |
161 |
} |
162 |
@@ -53,8 +56,9 @@ src_configure() { |
163 |
-DUSE_OPTIMIZED_BLAS=ON |
164 |
-DUSE_OPTIMIZED_LAPACK=ON |
165 |
-DLAPACKE=ON |
166 |
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)" |
167 |
- -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" |
168 |
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
169 |
+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
170 |
+ $(cmake-utils_use tmg LAPACKE_WITH_TMG) |
171 |
$(cmake-utils_use_build test TESTING) |
172 |
$(cmake-utils_use_use xblas XBLAS) |
173 |
$@ |
174 |
|
175 |
diff --git a/sci-libs/lapacke-reference/metadata.xml b/sci-libs/lapacke-reference/metadata.xml |
176 |
index 796e00d..0d4e062 100644 |
177 |
--- a/sci-libs/lapacke-reference/metadata.xml |
178 |
+++ b/sci-libs/lapacke-reference/metadata.xml |
179 |
@@ -1,13 +1,15 @@ |
180 |
<?xml version="1.0" encoding="UTF-8"?> |
181 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
182 |
<pkgmetadata> |
183 |
- <herd>sci</herd> |
184 |
- <longdescription lang="en"> |
185 |
+<herd>sci</herd> |
186 |
+<longdescription lang="en"> |
187 |
This implementation provides a native C interface to LAPACK routines |
188 |
available at www.netlib.org/lapack to facilitate usage of LAPACK |
189 |
functionality for C programmers. |
190 |
</longdescription> |
191 |
- <use> |
192 |
- <flag name="xblas">Build LAPACKE with extra precision (needs <pkg>sci-libs/xblas</pkg>)</flag> |
193 |
- </use> |
194 |
+<use> |
195 |
+ <flag name="tmg">Build LAPACKE with a Test Matrix Generator library</flag> |
196 |
+ <flag name="xblas">Build LAPACKE with extra precision (needs |
197 |
+ <pkg>sci-libs/xblas</pkg>)</flag> |
198 |
+</use> |
199 |
</pkgmetadata> |