1 |
commit: edbd0f3b68f9aed18d857108fa9ab72dfebac70e |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 23 05:13:31 2013 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 23 05:13:31 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=edbd0f3b |
7 |
|
8 |
sci-libs/lapacke-reference: Switch to EAPI5 |
9 |
|
10 |
Package-Manager: portage-2.2.01.21938-prefix |
11 |
|
12 |
--- |
13 |
sci-libs/lapacke-reference/ChangeLog | 6 +- |
14 |
.../files/lapack-3.4.1-cmake.patch | 208 -------------------- |
15 |
.../lapacke-reference-3.4.2.ebuild | 6 +- |
16 |
3 files changed, 8 insertions(+), 212 deletions(-) |
17 |
|
18 |
diff --git a/sci-libs/lapacke-reference/ChangeLog b/sci-libs/lapacke-reference/ChangeLog |
19 |
index a26b128..5efd3ad 100644 |
20 |
--- a/sci-libs/lapacke-reference/ChangeLog |
21 |
+++ b/sci-libs/lapacke-reference/ChangeLog |
22 |
@@ -1,7 +1,11 @@ |
23 |
# ChangeLog for sci-libs/lapacke-reference |
24 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
26 |
# $Header: $ |
27 |
|
28 |
+ 23 May 2013; Sébastien Fabbro <bicatali@g.o> |
29 |
+ -files/lapack-3.4.1-cmake.patch, lapacke-reference-3.4.2.ebuild: |
30 |
+ sci-libs/lapacke-reference: Switch to EAPI5 |
31 |
+ |
32 |
29 Nov 2012; Sébastien Fabbro <bicatali@g.o> |
33 |
-lapacke-reference-3.4.1.ebuild, lapacke-reference-3.4.2.ebuild, metadata.xml: |
34 |
sci-libs/lapacke-reference: added tmg for testing, cleaning up ebuild |
35 |
|
36 |
diff --git a/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch b/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch |
37 |
deleted file mode 100644 |
38 |
index 78dece8..0000000 |
39 |
--- a/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch |
40 |
+++ /dev/null |
41 |
@@ -1,208 +0,0 @@ |
42 |
-Index: CMakeLists.txt |
43 |
-=================================================================== |
44 |
---- CMakeLists.txt (revision 1294) |
45 |
-+++ CMakeLists.txt (working copy) |
46 |
-@@ -94,10 +94,6 @@ |
47 |
- # Precision to build |
48 |
- # By default all precisions are generated |
49 |
- |
50 |
--option(BUILD_SINGLE "Build LAPACK Single Precision" ON) |
51 |
--option(BUILD_DOUBLE "Build LAPACK Double Precision" ON) |
52 |
--option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON) |
53 |
--option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON) |
54 |
- |
55 |
- # -------------------------------------------------- |
56 |
- # Subdirectories that need to be processed |
57 |
-@@ -147,7 +143,49 @@ |
58 |
- find_library(XBLAS_LIBRARY NAMES xblas) |
59 |
- endif(USE_XBLAS) |
60 |
- |
61 |
--add_subdirectory(SRC) |
62 |
-+option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF) |
63 |
-+ |
64 |
-+# Check the usage of the user provided LAPACK libraries |
65 |
-+if(LAPACK_LIBRARIES) |
66 |
-+ include(CheckFortranFunctionExists) |
67 |
-+ set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES}) |
68 |
-+ CHECK_FORTRAN_FUNCTION_EXISTS("dpotrf" LAPACK_FOUND) |
69 |
-+ unset( CMAKE_REQUIRED_LIBRARIES ) |
70 |
-+ if(LAPACK_FOUND) |
71 |
-+ message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.") |
72 |
-+ else(LAPACK_FOUND) |
73 |
-+ message(ERROR "--> LAPACK supplied by user is not WORKING, CANNOT USE $LAPACK_LIBRARIES}.") |
74 |
-+ message(ERROR "--> Will use REFERENCE LAPACK (by default)") |
75 |
-+ message(ERROR "--> Or Correct your LAPACK_LIBRARIES entry ") |
76 |
-+ message(ERROR "--> Or Consider checking USE_OPTIMIZED_LAPACK") |
77 |
-+ endif(LAPACK_FOUND) |
78 |
-+ |
79 |
-+ # User did not provide a LAPACK Library but specified to search for one |
80 |
-+elseif( USE_OPTIMIZED_LAPACK ) |
81 |
-+ find_package( LAPACK ) |
82 |
-+endif (LAPACK_LIBRARIES) |
83 |
-+ |
84 |
-+# Neither user specified or optimized LAPACK libraries can be used |
85 |
-+if(NOT LAPACK_FOUND) |
86 |
-+ message(STATUS "Using supplied NETLIB LAPACK implementation") |
87 |
-+ set( LAPACK_LIBRARIES lapack ) |
88 |
-+ option(BUILD_SINGLE "Build LAPACK Single Precision" ON) |
89 |
-+ option(BUILD_DOUBLE "Build LAPACK Double Precision" ON) |
90 |
-+ option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON) |
91 |
-+ option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON) |
92 |
-+ add_subdirectory(SRC) |
93 |
-+else() |
94 |
-+ set( CMAKE_EXE_LINKER_FLAGS |
95 |
-+ "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" |
96 |
-+ CACHE STRING "Linker flags for executables" FORCE) |
97 |
-+ set( CMAKE_MODULE_LINKER_FLAGS |
98 |
-+ "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" |
99 |
-+ CACHE STRING "Linker flags for modules" FORCE) |
100 |
-+ set( CMAKE_SHARED_LINKER_FLAGS |
101 |
-+ "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" |
102 |
-+ CACHE STRING "Linker flags for shared libs" FORCE) |
103 |
-+endif( NOT LAPACK_FOUND ) |
104 |
-+ |
105 |
- if(BUILD_TESTING) |
106 |
- add_subdirectory(TESTING) |
107 |
- endif(BUILD_TESTING) |
108 |
-@@ -155,6 +193,10 @@ |
109 |
- # -------------------------------------------------- |
110 |
- # LAPACKE |
111 |
- option(LAPACKE "Build LAPACKE" OFF) |
112 |
-+if(LAPACKE) |
113 |
-+ add_subdirectory(lapacke) |
114 |
-+endif(LAPACKE) |
115 |
-+ |
116 |
- # LAPACKE has also the interface to some routines from tmglib, |
117 |
- # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE |
118 |
- option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF) |
119 |
-@@ -162,9 +204,6 @@ |
120 |
- option(LAPACKE "Build LAPACKE" ON) |
121 |
- endif(LAPACKE_WITH_TMG) |
122 |
- |
123 |
--if(LAPACKE) |
124 |
-- add_subdirectory(lapacke) |
125 |
--endif(LAPACKE) |
126 |
- |
127 |
- # -------------------------------------------------- |
128 |
- # CPACK Packaging |
129 |
-@@ -202,20 +241,24 @@ |
130 |
- OPTION(BUILD_STATIC_LIBS "Build static libraries" ON ) |
131 |
- #OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON ) |
132 |
- |
133 |
--if( NOT BLAS_FOUND ) |
134 |
-- if(LAPACKE) |
135 |
-- export(TARGETS blas lapack tmglib lapacke FILE lapack-targets.cmake) |
136 |
-- else (LAPACKE) |
137 |
-- export(TARGETS blas lapack tmglib FILE lapack-targets.cmake) |
138 |
-- endif(LAPACKE) |
139 |
--else( NOT BLAS_FOUND ) |
140 |
-- if(LAPACKE) |
141 |
-- export(TARGETS lapack tmglib lapacke FILE lapack-targets.cmake) |
142 |
-- else (LAPACKE) |
143 |
-- export(TARGETS lapack tmglib FILE lapack-targets.cmake) |
144 |
-- endif(LAPACKE) |
145 |
--endif( NOT BLAS_FOUND ) |
146 |
-+if(NOT BLAS_FOUND) |
147 |
-+ set(ALL_TARGETS ${ALL_TARGETS} blas) |
148 |
-+endif(NOT BLAS_FOUND) |
149 |
- |
150 |
-+if(NOT LAPACK_FOUND) |
151 |
-+ set(ALL_TARGETS ${ALL_TARGETS} lapack) |
152 |
-+endif(NOT LAPACK_FOUND) |
153 |
-+ |
154 |
-+if(BUILD_TESTING OR LAPACKE_WITH_TMG) |
155 |
-+ set(ALL_TARGETS ${ALL_TARGETS} tmglib) |
156 |
-+endif(BUILD_TESTING OR LAPACKE_WITH_TMG) |
157 |
-+ |
158 |
-+if(LAPACKE) |
159 |
-+ set(ALL_TARGETS ${ALL_TARGETS} lapacke) |
160 |
-+endif(LAPACKE) |
161 |
-+ |
162 |
-+export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake) |
163 |
-+ |
164 |
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in |
165 |
- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY) |
166 |
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in |
167 |
-Index: lapacke/example/CMakeLists.txt |
168 |
-=================================================================== |
169 |
---- lapacke/example/CMakeLists.txt (revision 1294) |
170 |
-+++ lapacke/example/CMakeLists.txt (working copy) |
171 |
-@@ -1,8 +1,8 @@ |
172 |
- add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c) |
173 |
- add_executable(xexample_ZGESV_rowmajor example_ZGESV_rowmajor.c) |
174 |
- |
175 |
--target_link_libraries(xexample_DGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES}) |
176 |
--target_link_libraries(xexample_ZGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES}) |
177 |
-+target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) |
178 |
-+target_link_libraries(xexample_ZGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) |
179 |
- |
180 |
- add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor) |
181 |
- add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor) |
182 |
-Index: lapacke/CMakeLists.txt |
183 |
-=================================================================== |
184 |
---- lapacke/CMakeLists.txt (revision 1294) |
185 |
-+++ lapacke/CMakeLists.txt (working copy) |
186 |
-@@ -45,14 +45,14 @@ |
187 |
- |
188 |
- if (USE_XBLAS) |
189 |
- add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ}) |
190 |
-- target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY}) |
191 |
-+ target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY}) |
192 |
- else (USE_XBLAS) |
193 |
- if (LAPACKE_WITH_TMG) |
194 |
- add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ}) |
195 |
-- target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} ) |
196 |
-+ target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) |
197 |
- else (LAPACKE_WITH_TMG) |
198 |
- add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ}) |
199 |
-- target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} ) |
200 |
-+ target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) |
201 |
- endif(LAPACKE_WITH_TMG) |
202 |
- endif(USE_XBLAS) |
203 |
- |
204 |
-Index: TESTING/LIN/CMakeLists.txt |
205 |
-=================================================================== |
206 |
---- TESTING/LIN/CMakeLists.txt (revision 1294) |
207 |
-+++ TESTING/LIN/CMakeLists.txt (working copy) |
208 |
-@@ -193,7 +193,7 @@ |
209 |
- |
210 |
- macro(add_lin_executable name ) |
211 |
- add_executable(${name} ${ARGN}) |
212 |
-- target_link_libraries(${name} tmglib lapack) |
213 |
-+ target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES}) |
214 |
- endmacro(add_lin_executable) |
215 |
- |
216 |
- IF(BUILD_SINGLE) |
217 |
-Index: TESTING/EIG/CMakeLists.txt |
218 |
-=================================================================== |
219 |
---- TESTING/EIG/CMakeLists.txt (revision 1294) |
220 |
-+++ TESTING/EIG/CMakeLists.txt (working copy) |
221 |
-@@ -119,7 +119,7 @@ |
222 |
- |
223 |
- macro(add_eig_executable name ) |
224 |
- add_executable(${name} ${ARGN}) |
225 |
-- target_link_libraries(${name} tmglib lapack ) |
226 |
-+ target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES}) |
227 |
- endmacro(add_eig_executable) |
228 |
- |
229 |
- if (BUILD_SINGLE) |
230 |
-Index: TESTING/MATGEN/CMakeLists.txt |
231 |
-=================================================================== |
232 |
---- TESTING/MATGEN/CMakeLists.txt (revision 1294) |
233 |
-+++ TESTING/MATGEN/CMakeLists.txt (working copy) |
234 |
-@@ -64,12 +64,12 @@ |
235 |
- set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN}) |
236 |
- endif() |
237 |
- |
238 |
--list(REMOVE_DUPLICATES ALLOBJ) |
239 |
-- |
240 |
- if (NOT ALLOBJ) |
241 |
- set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN} |
242 |
- ${DZATGEN}) |
243 |
-+else() |
244 |
-+ list(REMOVE_DUPLICATES ALLOBJ) |
245 |
- endif() |
246 |
- add_library(tmglib ${ALLOBJ} ) |
247 |
--target_link_libraries(tmglib lapack) |
248 |
-+target_link_libraries(tmglib ${LAPACK_LIBRARIES}) |
249 |
- lapack_install_library(tmglib) |
250 |
|
251 |
diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild |
252 |
index f8224d4..cdf324a 100644 |
253 |
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild |
254 |
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild |
255 |
@@ -1,8 +1,8 @@ |
256 |
-# Copyright 1999-2012 Gentoo Foundation |
257 |
+# Copyright 1999-2013 Gentoo Foundation |
258 |
# Distributed under the terms of the GNU General Public License v2 |
259 |
# $Header: $ |
260 |
|
261 |
-EAPI=4 |
262 |
+EAPI=5 |
263 |
|
264 |
inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs |
265 |
|
266 |
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND} |
267 |
S="${WORKDIR}/${MYP}" |
268 |
|
269 |
src_prepare() { |
270 |
- # avoid collision with other lapack |
271 |
+ # rename libraries to avoid collision with other lapacke |
272 |
sed -i \ |
273 |
-e 's:BINARY_DIR}/lapacke.pc:BINARY_DIR}/reflapacke.pc:' \ |
274 |
-e '/export/s:lapacke:reflapacke:g' \ |