1 |
commit: 97a8f7c1c9948ef28eb5a5c2466f0fd0f521d0dd |
2 |
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Dec 2 19:29:37 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 2 19:29:37 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=97a8f7c1 |
7 |
|
8 |
sci-libs/lapack-reference: update pkg-config handling |
9 |
|
10 |
.../files/lapack-fix-build-system.patch | 92 ++++++++++++++++++++++ |
11 |
.../lapack-reference/lapack-reference-3.6.0.ebuild | 13 ++- |
12 |
2 files changed, 101 insertions(+), 4 deletions(-) |
13 |
|
14 |
diff --git a/sci-libs/lapack-reference/files/lapack-fix-build-system.patch b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch |
15 |
new file mode 100644 |
16 |
index 0000000..8661709 |
17 |
--- /dev/null |
18 |
+++ b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch |
19 |
@@ -0,0 +1,92 @@ |
20 |
+--- lapack-3.6.0/BLAS/blas.pc.in |
21 |
++++ lapack-3.6.0/BLAS/blas.pc.in |
22 |
+@@ -1,5 +1,7 @@ |
23 |
+-prefix=@prefix@ |
24 |
+-libdir=@libdir@ |
25 |
++prefix=@CMAKE_INSTALL_PREFIX@ |
26 |
++exec_prefix=${prefix} |
27 |
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ |
28 |
++includedir=${prefix}/include |
29 |
+ |
30 |
+ Name: blas |
31 |
+ Description: Basic Linear Algebra Subprograms F77 reference implementations |
32 |
+--- lapack-3.6.0/BLAS/CMakeLists.txt |
33 |
++++ lapack-3.6.0/BLAS/CMakeLists.txt |
34 |
+@@ -2,7 +2,7 @@ |
35 |
+ if(BUILD_TESTING) |
36 |
+ add_subdirectory(TESTING) |
37 |
+ endif(BUILD_TESTING) |
38 |
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc) |
39 |
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY) |
40 |
+ install(FILES |
41 |
+ ${CMAKE_CURRENT_BINARY_DIR}/blas.pc |
42 |
+ DESTINATION ${PKG_CONFIG_DIR} |
43 |
+--- lapack-3.6.0/CBLAS/cblas.pc.in |
44 |
++++ lapack-3.6.0/CBLAS/cblas.pc.in |
45 |
+@@ -1,5 +1,7 @@ |
46 |
+-prefix=@prefix@ |
47 |
+-libdir=@libdir@ |
48 |
++prefix=@CMAKE_INSTALL_PREFIX@ |
49 |
++exec_prefix=${prefix} |
50 |
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ |
51 |
++includedir=${prefix}/include |
52 |
+ |
53 |
+ Name: lapacke |
54 |
+ Description: C Standard Interface to BLAS Linear Algebra PACKage |
55 |
+--- lapack-3.6.0/CBLAS/CMakeLists.txt |
56 |
++++ lapack-3.6.0/CBLAS/CMakeLists.txt |
57 |
+@@ -71,7 +71,7 @@ |
58 |
+ ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY) |
59 |
+ |
60 |
+ |
61 |
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc) |
62 |
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY) |
63 |
+ install(FILES |
64 |
+ ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc |
65 |
+ DESTINATION ${PKG_CONFIG_DIR} |
66 |
+--- lapack-3.6.0/CMakeLists.txt |
67 |
++++ lapack-3.6.0/CMakeLists.txt |
68 |
+@@ -333,7 +333,7 @@ |
69 |
+ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) |
70 |
+ |
71 |
+ |
72 |
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc) |
73 |
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) |
74 |
+ install(FILES |
75 |
+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc |
76 |
+ DESTINATION ${PKG_CONFIG_DIR} |
77 |
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt |
78 |
++++ lapack-3.6.0/LAPACKE/CMakeLists.txt |
79 |
+@@ -65,7 +65,7 @@ |
80 |
+ endif(BUILD_TESTING) |
81 |
+ |
82 |
+ |
83 |
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc) |
84 |
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY) |
85 |
+ install(FILES |
86 |
+ ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc |
87 |
+ DESTINATION ${PKG_CONFIG_DIR} |
88 |
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in |
89 |
++++ lapack-3.6.0/LAPACKE/lapacke.pc.in |
90 |
+@@ -1,5 +1,7 @@ |
91 |
+-prefix=@prefix@ |
92 |
+-libdir=@libdir@ |
93 |
++prefix=@CMAKE_INSTALL_PREFIX@ |
94 |
++exec_prefix=${prefix} |
95 |
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ |
96 |
++includedir=${prefix}/include |
97 |
+ |
98 |
+ Name: lapacke |
99 |
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage |
100 |
+--- lapack-3.6.0/lapack.pc.in |
101 |
++++ lapack-3.6.0/lapack.pc.in |
102 |
+@@ -1,5 +1,7 @@ |
103 |
+-prefix=@prefix@ |
104 |
+-libdir=@libdir@ |
105 |
++prefix=@CMAKE_INSTALL_PREFIX@ |
106 |
++exec_prefix=${prefix} |
107 |
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ |
108 |
++includedir=${prefix}/include |
109 |
+ |
110 |
+ Name: lapack |
111 |
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage |
112 |
|
113 |
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild |
114 |
index ac88f98..c06fe42 100644 |
115 |
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild |
116 |
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild |
117 |
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 ) |
118 |
|
119 |
NUMERIC_MODULE_NAME="reflapack" |
120 |
|
121 |
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 |
122 |
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 eutils |
123 |
|
124 |
MY_PN=lapack |
125 |
MYP=${MY_PN}-${PV} |
126 |
@@ -32,10 +32,15 @@ DEPEND="${RDEPEND} |
127 |
test? ( ${PYTHON_DEPS} )" |
128 |
|
129 |
S="${WORKDIR}/${MYP}" |
130 |
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" ) |
131 |
|
132 |
src_prepare() { |
133 |
numeric-int64_ensure_blas_int_support |
134 |
|
135 |
+ # the lapack(e)/(c)blas build system is somewhat broken |
136 |
+ # with respect to its pkg-config files. |
137 |
+ epatch "${PATCHES[@]}" |
138 |
+ |
139 |
# rename library to avoid collision with other lapack implementations |
140 |
# ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here, they |
141 |
# are in single quotes in the following seds. They are set later by |
142 |
@@ -50,9 +55,9 @@ src_prepare() { |
143 |
-e '/PROPERTIES/s:lapack:${LIBNAME}:g' \ |
144 |
SRC/CMakeLists.txt || die |
145 |
sed -i \ |
146 |
- -e '/Name: /s:lapack:${PROFNAME}:' \ |
147 |
- -e 's:-llapack:-l${LIBNAME}:g' \ |
148 |
- -e '/Requires: /s:blas:${BLAS_REQUIRES}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}:' \ |
149 |
+ -e '/Name: /s:lapack:@PROFNAME@:' \ |
150 |
+ -e 's:-llapack:-l@LIBNAME@:g' \ |
151 |
+ -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\: ${LAPACK_PKGCONFIG_FFLAGS}:' \ |
152 |
lapack.pc.in || die |
153 |
# some string does not get passed properly |
154 |
sed -i \ |