1 |
commit: 391d202b48d9344378b149c0769a2d657d09efef |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 28 22:20:01 2012 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 28 22:20:01 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=391d202b |
7 |
|
8 |
sci-libs/lapack-reference: Added tmg use flag, fix a failing post command test |
9 |
|
10 |
Package-Manager: portage-2.2.01.21313-prefix |
11 |
|
12 |
--- |
13 |
sci-libs/lapack-reference/ChangeLog | 5 + |
14 |
.../lapack-reference-3.3.1-r1.ebuild | 84 -------------------- |
15 |
.../lapack-reference/lapack-reference-3.4.1.ebuild | 62 -------------- |
16 |
.../lapack-reference/lapack-reference-3.4.2.ebuild | 10 ++- |
17 |
.../lapack-reference/lapack-reference-9999.ebuild | 64 +++++++--------- |
18 |
sci-libs/lapack-reference/metadata.xml | 12 ++- |
19 |
6 files changed, 47 insertions(+), 190 deletions(-) |
20 |
|
21 |
diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog |
22 |
index 9b54791..45fcb51 100644 |
23 |
--- a/sci-libs/lapack-reference/ChangeLog |
24 |
+++ b/sci-libs/lapack-reference/ChangeLog |
25 |
@@ -2,6 +2,11 @@ |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.51 2010/10/02 20:49:51 grobian Exp $ |
28 |
|
29 |
+ 28 Nov 2012; Sébastien Fabbro <bicatali@g.o> |
30 |
+ -lapack-reference-3.3.1-r1.ebuild, -lapack-reference-3.4.1.ebuild, |
31 |
+ lapack-reference-3.4.2.ebuild, lapack-reference-9999.ebuild, metadata.xml: |
32 |
+ sci-libs/lapack-reference: Added tmg use flag, fix a failing post command test |
33 |
+ |
34 |
*lapack-reference-3.4.2 (26 Oct 2012) |
35 |
|
36 |
26 Oct 2012; Sébastien Fabbro <bicatali@g.o> |
37 |
|
38 |
diff --git a/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild |
39 |
deleted file mode 100644 |
40 |
index 13e05e0..0000000 |
41 |
--- a/sci-libs/lapack-reference/lapack-reference-3.3.1-r1.ebuild |
42 |
+++ /dev/null |
43 |
@@ -1,84 +0,0 @@ |
44 |
-# Copyright 1999-2011 Gentoo Foundation |
45 |
-# Distributed under the terms of the GNU General Public License v2 |
46 |
-# $Header: $ |
47 |
- |
48 |
-EAPI=4 |
49 |
-inherit eutils toolchain-funcs cmake-utils alternatives-2 |
50 |
- |
51 |
-MYP=lapack-${PV} |
52 |
- |
53 |
-DESCRIPTION="Reference implementation of LAPACK" |
54 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
55 |
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz" |
56 |
- |
57 |
-LICENSE="BSD" |
58 |
-SLOT="0" |
59 |
-KEYWORDS="~amd64 ~x86" |
60 |
-IUSE="static-libs test xblas" |
61 |
- |
62 |
-RDEPEND="virtual/blas |
63 |
- virtual/fortran |
64 |
- xblas? ( sci-libs/xblas )" |
65 |
-DEPEND="${RDEPEND} |
66 |
- dev-util/pkgconfig" |
67 |
- |
68 |
-DOCS=( README ) |
69 |
- |
70 |
-S="${WORKDIR}/${MYP}" |
71 |
- |
72 |
-src_prepare() { |
73 |
- epatch \ |
74 |
- "${FILESDIR}"/${PV}-blas-libs.patch \ |
75 |
- "${FILESDIR}"/${PV}-xblas-libs.patch |
76 |
- # avoid collision with other lapack |
77 |
- sed -i \ |
78 |
- -e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \ |
79 |
- -e '/export/s:lapack:reflapack:g' \ |
80 |
- CMakeLists.txt || die |
81 |
- sed -i \ |
82 |
- -e 's:(lapack:(reflapack:g' \ |
83 |
- SRC/CMakeLists.txt || die |
84 |
- sed -i \ |
85 |
- -e 's:lapack:reflapack:g' \ |
86 |
- TESTING/*/CMakeLists.txt || die |
87 |
- sed -i \ |
88 |
- -e 's:-llapack:-lreflapack:g' \ |
89 |
- lapack.pc.in || die |
90 |
- export FC=$(tc-getFC) F77=$(tc-getF77) |
91 |
- use static-libs && mkdir "${WORKDIR}/${PN}_static" |
92 |
-} |
93 |
- |
94 |
-lapack_configure() { |
95 |
- mycmakeargs+=( |
96 |
- -DUSE_OPTIMIZED_BLAS=ON |
97 |
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)" |
98 |
- $(cmake-utils_use_build test TESTING) |
99 |
- $(cmake-utils_use xblas XBLAS) |
100 |
- ) |
101 |
- cmake-utils_src_configure |
102 |
-} |
103 |
- |
104 |
-src_configure() { |
105 |
- mycmakeargs=( -DBUILD_SHARED_LIBS=ON ) |
106 |
- lapack_configure |
107 |
- if use static-libs; then |
108 |
- mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) |
109 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure |
110 |
- fi |
111 |
-} |
112 |
- |
113 |
-src_compile() { |
114 |
- cmake-utils_src_compile |
115 |
- if use static-libs; then |
116 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile |
117 |
- fi |
118 |
-} |
119 |
- |
120 |
-src_install() { |
121 |
- cmake-utils_src_install |
122 |
- if use static-libs; then |
123 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install |
124 |
- fi |
125 |
- alternatives_for lapack reference 0 \ |
126 |
- "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc" |
127 |
-} |
128 |
|
129 |
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild |
130 |
deleted file mode 100644 |
131 |
index 0e40a1a..0000000 |
132 |
--- a/sci-libs/lapack-reference/lapack-reference-3.4.1.ebuild |
133 |
+++ /dev/null |
134 |
@@ -1,62 +0,0 @@ |
135 |
-# Copyright 1999-2012 Gentoo Foundation |
136 |
-# Distributed under the terms of the GNU General Public License v2 |
137 |
-# $Header: $ |
138 |
- |
139 |
-EAPI=4 |
140 |
-inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs |
141 |
- |
142 |
-MYP=lapack-${PV} |
143 |
- |
144 |
-DESCRIPTION="Reference implementation of LAPACK" |
145 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
146 |
-SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz" |
147 |
- |
148 |
-LICENSE="BSD" |
149 |
-SLOT="0" |
150 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
151 |
-IUSE="static-libs test xblas" |
152 |
- |
153 |
-RDEPEND="virtual/blas |
154 |
- virtual/fortran |
155 |
- xblas? ( sci-libs/xblas )" |
156 |
-DEPEND="${RDEPEND} |
157 |
- dev-util/pkgconfig" |
158 |
- |
159 |
-S="${WORKDIR}/${MYP}" |
160 |
- |
161 |
-src_prepare() { |
162 |
- epatch "${FILESDIR}"/${MYP}-cmake.patch |
163 |
- use static-libs && mkdir "${WORKDIR}/${PN}_static" |
164 |
-} |
165 |
- |
166 |
-src_configure() { |
167 |
- lapack_configure() { |
168 |
- local mycmakeargs=( |
169 |
- -DUSE_OPTIMIZED_BLAS=ON |
170 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
171 |
- $(cmake-utils_use_build test TESTING) |
172 |
- $(cmake-utils_use_use xblas XBLAS) |
173 |
- $@ |
174 |
- ) |
175 |
- cmake-utils_src_configure |
176 |
- } |
177 |
- |
178 |
- lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF |
179 |
- use static-libs && \ |
180 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \ |
181 |
- -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON |
182 |
-} |
183 |
- |
184 |
-src_compile() { |
185 |
- cmake-utils_src_compile |
186 |
- use static-libs && \ |
187 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile |
188 |
-} |
189 |
- |
190 |
-src_install() { |
191 |
- cmake-utils_src_install |
192 |
- use static-libs && \ |
193 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install |
194 |
- alternatives_for lapack reference 0 \ |
195 |
- "/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc" |
196 |
-} |
197 |
|
198 |
diff --git a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild |
199 |
index 0ce4f00..17d5bb6 100644 |
200 |
--- a/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild |
201 |
+++ b/sci-libs/lapack-reference/lapack-reference-3.4.2.ebuild |
202 |
@@ -14,10 +14,10 @@ SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz" |
203 |
LICENSE="BSD" |
204 |
SLOT="0" |
205 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
206 |
-IUSE="static-libs test xblas" |
207 |
+IUSE="static-libs test tmg xblas" |
208 |
|
209 |
-RDEPEND="virtual/blas |
210 |
- virtual/fortran |
211 |
+RDEPEND=" |
212 |
+ virtual/blas |
213 |
xblas? ( sci-libs/xblas )" |
214 |
DEPEND="${RDEPEND} |
215 |
virtual/pkgconfig" |
216 |
@@ -39,6 +39,9 @@ src_prepare() { |
217 |
-e 's:-llapack:-lreflapack:g' \ |
218 |
lapack.pc.in || die |
219 |
use static-libs && mkdir "${WORKDIR}/${PN}_static" |
220 |
+ # some string does not get pass properly |
221 |
+ sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die |
222 |
+ use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt |
223 |
} |
224 |
|
225 |
src_configure() { |
226 |
@@ -47,6 +50,7 @@ src_configure() { |
227 |
-DUSE_OPTIMIZED_BLAS=ON |
228 |
-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
229 |
$(cmake-utils_use_build test TESTING) |
230 |
+ $(cmake-utils_use_build tmg TESTING) |
231 |
$(cmake-utils_use_use xblas XBLAS) |
232 |
$@ |
233 |
) |
234 |
|
235 |
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild |
236 |
index 535191d..2dcc485 100644 |
237 |
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild |
238 |
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild |
239 |
@@ -3,7 +3,7 @@ |
240 |
# $Header: $ |
241 |
|
242 |
EAPI=4 |
243 |
-inherit eutils toolchain-funcs cmake-utils alternatives-2 subversion |
244 |
+inherit eutils fortran-2 cmake-utils alternatives-2 toolchain-funcs subversion |
245 |
|
246 |
MYP=lapack-${PV} |
247 |
|
248 |
@@ -14,73 +14,65 @@ ESVN_REPO_URI="https://icl.cs.utk.edu/svn/lapack-dev/lapack/trunk" |
249 |
LICENSE="BSD" |
250 |
SLOT="0" |
251 |
KEYWORDS="" |
252 |
-IUSE="static-libs test xblas" |
253 |
+IUSE="static-libs test tmg xblas" |
254 |
|
255 |
-RDEPEND="virtual/blas |
256 |
- virtual/fortran |
257 |
+RDEPEND=" |
258 |
+ virtual/blas |
259 |
xblas? ( sci-libs/xblas )" |
260 |
DEPEND="${RDEPEND} |
261 |
- dev-util/pkgconfig" |
262 |
- |
263 |
-DOCS=( README ) |
264 |
+ virtual/pkgconfig" |
265 |
|
266 |
S="${WORKDIR}/${MYP}" |
267 |
|
268 |
src_prepare() { |
269 |
- # not longer needed |
270 |
- #epatch \ |
271 |
- # "${FILESDIR}"/${PV}-blas-libs.patch \ |
272 |
- # "${FILESDIR}"/${PV}-xblas-libs.patch |
273 |
- |
274 |
# avoid collision with other lapack |
275 |
sed -i \ |
276 |
-e 's:BINARY_DIR}/lapack.pc:BINARY_DIR}/reflapack.pc:' \ |
277 |
-e '/export/s:lapack:reflapack:g' \ |
278 |
+ -e '/ALL_TARGETS/s:lapack):reflapack):' \ |
279 |
+ -e '/LAPACK_LIBRARIES/s:lapack:reflapack:g' \ |
280 |
CMakeLists.txt || die |
281 |
sed -i \ |
282 |
-e 's:(lapack:(reflapack:g' \ |
283 |
SRC/CMakeLists.txt || die |
284 |
sed -i \ |
285 |
- -e 's:lapack:reflapack:g' \ |
286 |
- TESTING/*/CMakeLists.txt || die |
287 |
- sed -i \ |
288 |
-e 's:-llapack:-lreflapack:g' \ |
289 |
lapack.pc.in || die |
290 |
- export FC=$(tc-getFC) F77=$(tc-getF77) |
291 |
use static-libs && mkdir "${WORKDIR}/${PN}_static" |
292 |
-} |
293 |
- |
294 |
-lapack_configure() { |
295 |
- mycmakeargs+=( |
296 |
- -DUSE_OPTIMIZED_BLAS=ON |
297 |
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)" |
298 |
- $(cmake-utils_use_build test TESTING) |
299 |
- $(cmake-utils_use xblas XBLAS) |
300 |
- ) |
301 |
- cmake-utils_src_configure |
302 |
+ # some string does not get pass properly |
303 |
+ sed -i -e '/lapack_testing.py/d' CTestCustom.cmake.in || die |
304 |
+ use tmg || sed -i -e '/lapack_install_library(tmglib)/d' TESTING/MATGEN/CMakeLists.txt |
305 |
} |
306 |
|
307 |
src_configure() { |
308 |
- mycmakeargs=( -DBUILD_SHARED_LIBS=ON ) |
309 |
- lapack_configure |
310 |
- if use static-libs; then |
311 |
- mycmakeargs=( -DBUILD_SHARED_LIBS=OFF ) |
312 |
- CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure |
313 |
- fi |
314 |
+ lapack_configure() { |
315 |
+ local mycmakeargs=( |
316 |
+ -DUSE_OPTIMIZED_BLAS=ON |
317 |
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
318 |
+ $(cmake-utils_use_build test TESTING) |
319 |
+ $(cmake-utils_use_build tmg TESTING) |
320 |
+ $(cmake-utils_use_use xblas XBLAS) |
321 |
+ $@ |
322 |
+ ) |
323 |
+ cmake-utils_src_configure |
324 |
+ } |
325 |
+ |
326 |
+ lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF |
327 |
+ use static-libs && \ |
328 |
+ CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \ |
329 |
+ -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON |
330 |
} |
331 |
|
332 |
src_compile() { |
333 |
cmake-utils_src_compile |
334 |
- if use static-libs; then |
335 |
+ use static-libs && \ |
336 |
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile |
337 |
- fi |
338 |
} |
339 |
|
340 |
src_install() { |
341 |
cmake-utils_src_install |
342 |
- if use static-libs; then |
343 |
+ use static-libs && \ |
344 |
CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install |
345 |
- fi |
346 |
alternatives_for lapack reference 0 \ |
347 |
"/usr/$(get_libdir)/pkgconfig/lapack.pc" "reflapack.pc" |
348 |
} |
349 |
|
350 |
diff --git a/sci-libs/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml |
351 |
index 26a4f9f..62602d0 100644 |
352 |
--- a/sci-libs/lapack-reference/metadata.xml |
353 |
+++ b/sci-libs/lapack-reference/metadata.xml |
354 |
@@ -1,8 +1,8 @@ |
355 |
<?xml version="1.0" encoding="UTF-8"?> |
356 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
357 |
<pkgmetadata> |
358 |
- <herd>sci</herd> |
359 |
- <longdescription lang="en"> |
360 |
+<herd>sci</herd> |
361 |
+<longdescription lang="en"> |
362 |
The Linear Algebra PACKage (LAPACK) is a comprehensive library that |
363 |
does linear algebra operations including matrix inversions, least |
364 |
squared solutions to linear sets of equations, eigenvector analysis, |
365 |
@@ -12,7 +12,9 @@ |
366 |
Netlib for LAPACK and optionnally the one for the Basic Linear |
367 |
Algebra Subprogram (BLAS). |
368 |
</longdescription> |
369 |
- <use> |
370 |
- <flag name="xblas">Build LAPACK with extra precision (needs <pkg>sci-libs/xblas</pkg>)</flag> |
371 |
- </use> |
372 |
+<use> |
373 |
+ <flag name="xblas">Build LAPACK with extra precision (needs |
374 |
+ <pkg>sci-libs/xblas</pkg>)</flag> |
375 |
+ <flag name="xblas">Build the Test Matrix Generator library for lapack</flag> |
376 |
+</use> |
377 |
</pkgmetadata> |