| 1 |
commit: 681412c77f8c1d58962f8159eb0cd0f648888d70 |
| 2 |
Author: efferre79 <rossi.f <AT> inwind <DOT> it> |
| 3 |
AuthorDate: Mon Jan 18 10:48:46 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 6 21:29:06 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=681412c7 |
| 7 |
|
| 8 |
sci-libs/lapack: add deprecated functions also to 3.9.0 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/702254 |
| 11 |
Signed-off-by: efferre79 <rossi.f <AT> inwind.it> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/lapack-3.9.0-deprecated-headers.patch | 138 +++++++++++++++++++++ |
| 15 |
sci-libs/lapack/lapack-3.8.0-r1.ebuild | 4 +- |
| 16 |
sci-libs/lapack/lapack-3.8.0.ebuild | 4 +- |
| 17 |
...{lapack-3.9.0.ebuild => lapack-3.9.0-r1.ebuild} | 11 +- |
| 18 |
sci-libs/lapack/lapack-3.9.0.ebuild | 2 +- |
| 19 |
5 files changed, 152 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..9c0fb4e56e5 |
| 24 |
--- /dev/null |
| 25 |
+++ b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch |
| 26 |
@@ -0,0 +1,138 @@ |
| 27 |
+From 87536aa3c8bb0af00f66088fb6ac05d87509e011 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@××××××.org> |
| 29 |
+Date: Sat, 23 Nov 2019 12:22:20 +0100 |
| 30 |
+Subject: [PATCH] Restore missing prototypes for deprecated LAPACK functions |
| 31 |
+ |
| 32 |
+Some LAPACK functions prototypes were inadvertedly dropped in 3.9.0. As a |
| 33 |
+consequence, LAPACKE has several unresolved symbols. |
| 34 |
+ |
| 35 |
+Closes #365 |
| 36 |
+--- |
| 37 |
+ LAPACKE/include/lapack.h | 100 +++++++++++++++++++++++++++++++++++++++ |
| 38 |
+ 1 file changed, 100 insertions(+) |
| 39 |
+ |
| 40 |
+diff --git a/LAPACKE/include/lapack.h b/LAPACKE/include/lapack.h |
| 41 |
+index 3f425325f..5c131d844 100644 |
| 42 |
+--- a/LAPACKE/include/lapack.h |
| 43 |
++++ b/LAPACKE/include/lapack.h |
| 44 |
+@@ -1842,6 +1842,28 @@ void LAPACK_zgeqlf( |
| 45 |
+ lapack_complex_double* work, lapack_int const* lwork, |
| 46 |
+ lapack_int* info ); |
| 47 |
+ |
| 48 |
++#define LAPACK_sgeqpf LAPACK_GLOBAL(sgeqpf,SGEQPF) |
| 49 |
++void LAPACK_sgeqpf( lapack_int* m, lapack_int* n, float* a, lapack_int* lda, |
| 50 |
++ lapack_int* jpvt, float* tau, float* work, |
| 51 |
++ lapack_int *info ); |
| 52 |
++ |
| 53 |
++#define LAPACK_dgeqpf LAPACK_GLOBAL(dgeqpf,DGEQPF) |
| 54 |
++void LAPACK_dgeqpf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda, |
| 55 |
++ lapack_int* jpvt, double* tau, double* work, |
| 56 |
++ lapack_int *info ); |
| 57 |
++ |
| 58 |
++#define LAPACK_cgeqpf LAPACK_GLOBAL(cgeqpf,CGEQPF) |
| 59 |
++void LAPACK_cgeqpf( lapack_int* m, lapack_int* n, lapack_complex_float* a, |
| 60 |
++ lapack_int* lda, lapack_int* jpvt, |
| 61 |
++ lapack_complex_float* tau, lapack_complex_float* work, |
| 62 |
++ float* rwork, lapack_int *info ); |
| 63 |
++ |
| 64 |
++#define LAPACK_zgeqpf LAPACK_GLOBAL(zgeqpf,ZGEQPF) |
| 65 |
++void LAPACK_zgeqpf( lapack_int* m, lapack_int* n, lapack_complex_double* a, |
| 66 |
++ lapack_int* lda, lapack_int* jpvt, |
| 67 |
++ lapack_complex_double* tau, lapack_complex_double* work, |
| 68 |
++ double* rwork, lapack_int *info ); |
| 69 |
++ |
| 70 |
+ #define LAPACK_cgeqp3 LAPACK_GLOBAL(cgeqp3,CGEQP3) |
| 71 |
+ void LAPACK_cgeqp3( |
| 72 |
+ lapack_int const* m, lapack_int const* n, |
| 73 |
+@@ -3617,6 +3639,47 @@ void LAPACK_zggrqf( |
| 74 |
+ lapack_complex_double* work, lapack_int const* lwork, |
| 75 |
+ lapack_int* info ); |
| 76 |
+ |
| 77 |
++#define LAPACK_sggsvd LAPACK_GLOBAL(sggsvd,SGGSVD) |
| 78 |
++lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq, |
| 79 |
++ lapack_int m, lapack_int n, lapack_int p, |
| 80 |
++ lapack_int* k, lapack_int* l, float* a, |
| 81 |
++ lapack_int lda, float* b, lapack_int ldb, |
| 82 |
++ float* alpha, float* beta, float* u, lapack_int ldu, |
| 83 |
++ float* v, lapack_int ldv, float* q, lapack_int ldq, |
| 84 |
++ lapack_int* iwork ); |
| 85 |
++ |
| 86 |
++#define LAPACK_dggsvd LAPACK_GLOBAL(dggsvd,DGGSVD) |
| 87 |
++lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq, |
| 88 |
++ lapack_int m, lapack_int n, lapack_int p, |
| 89 |
++ lapack_int* k, lapack_int* l, double* a, |
| 90 |
++ lapack_int lda, double* b, lapack_int ldb, |
| 91 |
++ double* alpha, double* beta, double* u, |
| 92 |
++ lapack_int ldu, double* v, lapack_int ldv, double* q, |
| 93 |
++ lapack_int ldq, lapack_int* iwork ); |
| 94 |
++ |
| 95 |
++#define LAPACK_cggsvd LAPACK_GLOBAL(cggsvd,CGGSVD) |
| 96 |
++lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq, |
| 97 |
++ lapack_int m, lapack_int n, lapack_int p, |
| 98 |
++ lapack_int* k, lapack_int* l, |
| 99 |
++ lapack_complex_float* a, lapack_int lda, |
| 100 |
++ lapack_complex_float* b, lapack_int ldb, |
| 101 |
++ float* alpha, float* beta, lapack_complex_float* u, |
| 102 |
++ lapack_int ldu, lapack_complex_float* v, |
| 103 |
++ lapack_int ldv, lapack_complex_float* q, |
| 104 |
++ lapack_int ldq, lapack_int* iwork ); |
| 105 |
++ |
| 106 |
++#define LAPACK_zggsvd LAPACK_GLOBAL(zggsvd,ZGGSVD) |
| 107 |
++lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq, |
| 108 |
++ lapack_int m, lapack_int n, lapack_int p, |
| 109 |
++ lapack_int* k, lapack_int* l, |
| 110 |
++ lapack_complex_double* a, lapack_int lda, |
| 111 |
++ lapack_complex_double* b, lapack_int ldb, |
| 112 |
++ double* alpha, double* beta, |
| 113 |
++ lapack_complex_double* u, lapack_int ldu, |
| 114 |
++ lapack_complex_double* v, lapack_int ldv, |
| 115 |
++ lapack_complex_double* q, lapack_int ldq, |
| 116 |
++ lapack_int* iwork ); |
| 117 |
++ |
| 118 |
+ #define LAPACK_cggsvd3 LAPACK_GLOBAL(cggsvd3,CGGSVD3) |
| 119 |
+ void LAPACK_cggsvd3( |
| 120 |
+ char const* jobu, char const* jobv, char const* jobq, |
| 121 |
+@@ -3679,6 +3742,43 @@ void LAPACK_zggsvd3( |
| 122 |
+ lapack_int* iwork, |
| 123 |
+ lapack_int* info ); |
| 124 |
+ |
| 125 |
++#define LAPACK_sggsvp LAPACK_GLOBAL(sggsvp,SGGSVP) |
| 126 |
++lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq, |
| 127 |
++ lapack_int m, lapack_int p, lapack_int n, float* a, |
| 128 |
++ lapack_int lda, float* b, lapack_int ldb, float tola, |
| 129 |
++ float tolb, lapack_int* k, lapack_int* l, float* u, |
| 130 |
++ lapack_int ldu, float* v, lapack_int ldv, float* q, |
| 131 |
++ lapack_int ldq ); |
| 132 |
++ |
| 133 |
++#define LAPACK_dggsvp LAPACK_GLOBAL(dggsvp,DGGSVP) |
| 134 |
++lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq, |
| 135 |
++ lapack_int m, lapack_int p, lapack_int n, double* a, |
| 136 |
++ lapack_int lda, double* b, lapack_int ldb, |
| 137 |
++ double tola, double tolb, lapack_int* k, |
| 138 |
++ lapack_int* l, double* u, lapack_int ldu, double* v, |
| 139 |
++ lapack_int ldv, double* q, lapack_int ldq ); |
| 140 |
++ |
| 141 |
++#define LAPACK_cggsvp LAPACK_GLOBAL(cggsvp,CGGSVP) |
| 142 |
++lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq, |
| 143 |
++ lapack_int m, lapack_int p, lapack_int n, |
| 144 |
++ lapack_complex_float* a, lapack_int lda, |
| 145 |
++ lapack_complex_float* b, lapack_int ldb, float tola, |
| 146 |
++ float tolb, lapack_int* k, lapack_int* l, |
| 147 |
++ lapack_complex_float* u, lapack_int ldu, |
| 148 |
++ lapack_complex_float* v, lapack_int ldv, |
| 149 |
++ lapack_complex_float* q, lapack_int ldq ); |
| 150 |
++ |
| 151 |
++#define LAPACK_zggsvp LAPACK_GLOBAL(zggsvp,ZGGSVP) |
| 152 |
++lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq, |
| 153 |
++ lapack_int m, lapack_int p, lapack_int n, |
| 154 |
++ lapack_complex_double* a, lapack_int lda, |
| 155 |
++ lapack_complex_double* b, lapack_int ldb, |
| 156 |
++ double tola, double tolb, lapack_int* k, |
| 157 |
++ lapack_int* l, lapack_complex_double* u, |
| 158 |
++ lapack_int ldu, lapack_complex_double* v, |
| 159 |
++ lapack_int ldv, lapack_complex_double* q, |
| 160 |
++ lapack_int ldq ); |
| 161 |
++ |
| 162 |
+ #define LAPACK_cggsvp3 LAPACK_GLOBAL(cggsvp3,CGGSVP3) |
| 163 |
+ void LAPACK_cggsvp3( |
| 164 |
+ char const* jobu, char const* jobv, char const* jobq, |
| 165 |
|
| 166 |
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild |
| 167 |
index a64e00ff893..d97667a141d 100644 |
| 168 |
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild |
| 169 |
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild |
| 170 |
@@ -6,8 +6,8 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 171 |
inherit cmake-utils |
| 172 |
|
| 173 |
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" |
| 174 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
| 175 |
-SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz" |
| 176 |
+HOMEPAGE="https://www.netlib.org/lapack/" |
| 177 |
+SRC_URI="https://www.netlib.org/${PN}/${P}.tar.gz" |
| 178 |
|
| 179 |
LICENSE="BSD" |
| 180 |
SLOT="0" |
| 181 |
|
| 182 |
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild |
| 183 |
index 1abb3b17f3e..72b89dba3ea 100644 |
| 184 |
--- a/sci-libs/lapack/lapack-3.8.0.ebuild |
| 185 |
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild |
| 186 |
@@ -6,8 +6,8 @@ CMAKE_MAKEFILE_GENERATOR=emake |
| 187 |
inherit cmake-utils |
| 188 |
|
| 189 |
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" |
| 190 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
| 191 |
-SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz" |
| 192 |
+HOMEPAGE="https://www.netlib.org/lapack/" |
| 193 |
+SRC_URI="https://www.netlib.org/${PN}/${P}.tar.gz" |
| 194 |
|
| 195 |
LICENSE="BSD" |
| 196 |
SLOT="0" |
| 197 |
|
| 198 |
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0-r1.ebuild |
| 199 |
similarity index 92% |
| 200 |
copy from sci-libs/lapack/lapack-3.9.0.ebuild |
| 201 |
copy to sci-libs/lapack/lapack-3.9.0-r1.ebuild |
| 202 |
index 2d1c181e05d..01d9add8fb4 100644 |
| 203 |
--- a/sci-libs/lapack/lapack-3.9.0.ebuild |
| 204 |
+++ b/sci-libs/lapack/lapack-3.9.0-r1.ebuild |
| 205 |
@@ -6,14 +6,14 @@ EAPI=7 |
| 206 |
inherit cmake |
| 207 |
|
| 208 |
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" |
| 209 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
| 210 |
+HOMEPAGE="https://www.netlib.org/lapack/" |
| 211 |
SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 212 |
|
| 213 |
LICENSE="BSD" |
| 214 |
SLOT="0" |
| 215 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 216 |
# TODO: static-libs 64bit-index |
| 217 |
-IUSE="lapacke doc eselect-ldso test" |
| 218 |
+IUSE="lapacke deprecated doc eselect-ldso test" |
| 219 |
RESTRICT="!test? ( test )" |
| 220 |
|
| 221 |
BDEPEND="virtual/pkgconfig" |
| 222 |
@@ -31,10 +31,17 @@ PATCHES=( |
| 223 |
"${FILESDIR}/${PN}-3.9.0-build-tests.patch" |
| 224 |
) |
| 225 |
|
| 226 |
+src_prepare() { |
| 227 |
+ use deprecated && eapply "${FILESDIR}/${P}-deprecated-headers.patch" |
| 228 |
+ |
| 229 |
+ cmake_src_prepare |
| 230 |
+} |
| 231 |
+ |
| 232 |
src_configure() { |
| 233 |
local mycmakeargs=( |
| 234 |
-DCBLAS=ON |
| 235 |
-DLAPACKE=$(usex lapacke) |
| 236 |
+ -DBUILD_DEPRECATED=$(usex deprecated) |
| 237 |
-DBUILD_SHARED_LIBS=ON |
| 238 |
-DBUILD_TESTING=$(usex test) |
| 239 |
) |
| 240 |
|
| 241 |
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild |
| 242 |
index 2d1c181e05d..bf8674a2fab 100644 |
| 243 |
--- a/sci-libs/lapack/lapack-3.9.0.ebuild |
| 244 |
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild |
| 245 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 246 |
inherit cmake |
| 247 |
|
| 248 |
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations" |
| 249 |
-HOMEPAGE="http://www.netlib.org/lapack/" |
| 250 |
+HOMEPAGE="https://www.netlib.org/lapack/" |
| 251 |
SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 252 |
|
| 253 |
LICENSE="BSD" |
Archives