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