From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/, sci-libs/lapack/files/
Date: Sat, 6 Feb 2021 21:29:13 +0000 (UTC) [thread overview]
Message-ID: <1612646946.681412c77f8c1d58962f8159eb0cd0f648888d70.sam@gentoo> (raw)
commit: 681412c77f8c1d58962f8159eb0cd0f648888d70
Author: efferre79 <rossi.f <AT> inwind <DOT> it>
AuthorDate: Mon Jan 18 10:48:46 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 21:29:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=681412c7
sci-libs/lapack: add deprecated functions also to 3.9.0
Closes: https://bugs.gentoo.org/702254
Signed-off-by: efferre79 <rossi.f <AT> inwind.it>
Signed-off-by: Sam James <sam <AT> gentoo.org>
| 138 +++++++++++++++++++++
sci-libs/lapack/lapack-3.8.0-r1.ebuild | 4 +-
sci-libs/lapack/lapack-3.8.0.ebuild | 4 +-
...{lapack-3.9.0.ebuild => lapack-3.9.0-r1.ebuild} | 11 +-
sci-libs/lapack/lapack-3.9.0.ebuild | 2 +-
5 files changed, 152 insertions(+), 7 deletions(-)
--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
new file mode 100644
index 00000000000..9c0fb4e56e5
--- /dev/null
+++ b/sci-libs/lapack/files/lapack-3.9.0-deprecated-headers.patch
@@ -0,0 +1,138 @@
+From 87536aa3c8bb0af00f66088fb6ac05d87509e011 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@debian.org>
+Date: Sat, 23 Nov 2019 12:22:20 +0100
+Subject: [PATCH] Restore missing prototypes for deprecated LAPACK functions
+
+Some LAPACK functions prototypes were inadvertedly dropped in 3.9.0. As a
+consequence, LAPACKE has several unresolved symbols.
+
+Closes #365
+---
+ LAPACKE/include/lapack.h | 100 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 100 insertions(+)
+
+diff --git a/LAPACKE/include/lapack.h b/LAPACKE/include/lapack.h
+index 3f425325f..5c131d844 100644
+--- a/LAPACKE/include/lapack.h
++++ b/LAPACKE/include/lapack.h
+@@ -1842,6 +1842,28 @@ void LAPACK_zgeqlf(
+ lapack_complex_double* work, lapack_int const* lwork,
+ lapack_int* info );
+
++#define LAPACK_sgeqpf LAPACK_GLOBAL(sgeqpf,SGEQPF)
++void LAPACK_sgeqpf( lapack_int* m, lapack_int* n, float* a, lapack_int* lda,
++ lapack_int* jpvt, float* tau, float* work,
++ lapack_int *info );
++
++#define LAPACK_dgeqpf LAPACK_GLOBAL(dgeqpf,DGEQPF)
++void LAPACK_dgeqpf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda,
++ lapack_int* jpvt, double* tau, double* work,
++ lapack_int *info );
++
++#define LAPACK_cgeqpf LAPACK_GLOBAL(cgeqpf,CGEQPF)
++void LAPACK_cgeqpf( lapack_int* m, lapack_int* n, lapack_complex_float* a,
++ lapack_int* lda, lapack_int* jpvt,
++ lapack_complex_float* tau, lapack_complex_float* work,
++ float* rwork, lapack_int *info );
++
++#define LAPACK_zgeqpf LAPACK_GLOBAL(zgeqpf,ZGEQPF)
++void LAPACK_zgeqpf( lapack_int* m, lapack_int* n, lapack_complex_double* a,
++ lapack_int* lda, lapack_int* jpvt,
++ lapack_complex_double* tau, lapack_complex_double* work,
++ double* rwork, lapack_int *info );
++
+ #define LAPACK_cgeqp3 LAPACK_GLOBAL(cgeqp3,CGEQP3)
+ void LAPACK_cgeqp3(
+ lapack_int const* m, lapack_int const* n,
+@@ -3617,6 +3639,47 @@ void LAPACK_zggrqf(
+ lapack_complex_double* work, lapack_int const* lwork,
+ lapack_int* info );
+
++#define LAPACK_sggsvd LAPACK_GLOBAL(sggsvd,SGGSVD)
++lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int n, lapack_int p,
++ lapack_int* k, lapack_int* l, float* a,
++ lapack_int lda, float* b, lapack_int ldb,
++ float* alpha, float* beta, float* u, lapack_int ldu,
++ float* v, lapack_int ldv, float* q, lapack_int ldq,
++ lapack_int* iwork );
++
++#define LAPACK_dggsvd LAPACK_GLOBAL(dggsvd,DGGSVD)
++lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int n, lapack_int p,
++ lapack_int* k, lapack_int* l, double* a,
++ lapack_int lda, double* b, lapack_int ldb,
++ double* alpha, double* beta, double* u,
++ lapack_int ldu, double* v, lapack_int ldv, double* q,
++ lapack_int ldq, lapack_int* iwork );
++
++#define LAPACK_cggsvd LAPACK_GLOBAL(cggsvd,CGGSVD)
++lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int n, lapack_int p,
++ lapack_int* k, lapack_int* l,
++ lapack_complex_float* a, lapack_int lda,
++ lapack_complex_float* b, lapack_int ldb,
++ float* alpha, float* beta, lapack_complex_float* u,
++ lapack_int ldu, lapack_complex_float* v,
++ lapack_int ldv, lapack_complex_float* q,
++ lapack_int ldq, lapack_int* iwork );
++
++#define LAPACK_zggsvd LAPACK_GLOBAL(zggsvd,ZGGSVD)
++lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int n, lapack_int p,
++ lapack_int* k, lapack_int* l,
++ lapack_complex_double* a, lapack_int lda,
++ lapack_complex_double* b, lapack_int ldb,
++ double* alpha, double* beta,
++ lapack_complex_double* u, lapack_int ldu,
++ lapack_complex_double* v, lapack_int ldv,
++ lapack_complex_double* q, lapack_int ldq,
++ lapack_int* iwork );
++
+ #define LAPACK_cggsvd3 LAPACK_GLOBAL(cggsvd3,CGGSVD3)
+ void LAPACK_cggsvd3(
+ char const* jobu, char const* jobv, char const* jobq,
+@@ -3679,6 +3742,43 @@ void LAPACK_zggsvd3(
+ lapack_int* iwork,
+ lapack_int* info );
+
++#define LAPACK_sggsvp LAPACK_GLOBAL(sggsvp,SGGSVP)
++lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int p, lapack_int n, float* a,
++ lapack_int lda, float* b, lapack_int ldb, float tola,
++ float tolb, lapack_int* k, lapack_int* l, float* u,
++ lapack_int ldu, float* v, lapack_int ldv, float* q,
++ lapack_int ldq );
++
++#define LAPACK_dggsvp LAPACK_GLOBAL(dggsvp,DGGSVP)
++lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int p, lapack_int n, double* a,
++ lapack_int lda, double* b, lapack_int ldb,
++ double tola, double tolb, lapack_int* k,
++ lapack_int* l, double* u, lapack_int ldu, double* v,
++ lapack_int ldv, double* q, lapack_int ldq );
++
++#define LAPACK_cggsvp LAPACK_GLOBAL(cggsvp,CGGSVP)
++lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int p, lapack_int n,
++ lapack_complex_float* a, lapack_int lda,
++ lapack_complex_float* b, lapack_int ldb, float tola,
++ float tolb, lapack_int* k, lapack_int* l,
++ lapack_complex_float* u, lapack_int ldu,
++ lapack_complex_float* v, lapack_int ldv,
++ lapack_complex_float* q, lapack_int ldq );
++
++#define LAPACK_zggsvp LAPACK_GLOBAL(zggsvp,ZGGSVP)
++lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq,
++ lapack_int m, lapack_int p, lapack_int n,
++ lapack_complex_double* a, lapack_int lda,
++ lapack_complex_double* b, lapack_int ldb,
++ double tola, double tolb, lapack_int* k,
++ lapack_int* l, lapack_complex_double* u,
++ lapack_int ldu, lapack_complex_double* v,
++ lapack_int ldv, lapack_complex_double* q,
++ lapack_int ldq );
++
+ #define LAPACK_cggsvp3 LAPACK_GLOBAL(cggsvp3,CGGSVP3)
+ void LAPACK_cggsvp3(
+ char const* jobu, char const* jobv, char const* jobq,
diff --git a/sci-libs/lapack/lapack-3.8.0-r1.ebuild b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
index a64e00ff893..d97667a141d 100644
--- a/sci-libs/lapack/lapack-3.8.0-r1.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0-r1.ebuild
@@ -6,8 +6,8 @@ CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake-utils
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://www.netlib.org/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 1abb3b17f3e..72b89dba3ea 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -6,8 +6,8 @@ CMAKE_MAKEFILE_GENERATOR=emake
inherit cmake-utils
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="http://www.netlib.org/lapack/"
-SRC_URI="http://www.netlib.org/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.netlib.org/lapack/"
+SRC_URI="https://www.netlib.org/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0-r1.ebuild
similarity index 92%
copy from sci-libs/lapack/lapack-3.9.0.ebuild
copy to sci-libs/lapack/lapack-3.9.0-r1.ebuild
index 2d1c181e05d..01d9add8fb4 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0-r1.ebuild
@@ -6,14 +6,14 @@ EAPI=7
inherit cmake
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="http://www.netlib.org/lapack/"
+HOMEPAGE="https://www.netlib.org/lapack/"
SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
# TODO: static-libs 64bit-index
-IUSE="lapacke doc eselect-ldso test"
+IUSE="lapacke deprecated doc eselect-ldso test"
RESTRICT="!test? ( test )"
BDEPEND="virtual/pkgconfig"
@@ -31,10 +31,17 @@ PATCHES=(
"${FILESDIR}/${PN}-3.9.0-build-tests.patch"
)
+src_prepare() {
+ use deprecated && eapply "${FILESDIR}/${P}-deprecated-headers.patch"
+
+ cmake_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DCBLAS=ON
-DLAPACKE=$(usex lapacke)
+ -DBUILD_DEPRECATED=$(usex deprecated)
-DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING=$(usex test)
)
diff --git a/sci-libs/lapack/lapack-3.9.0.ebuild b/sci-libs/lapack/lapack-3.9.0.ebuild
index 2d1c181e05d..bf8674a2fab 100644
--- a/sci-libs/lapack/lapack-3.9.0.ebuild
+++ b/sci-libs/lapack/lapack-3.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit cmake
DESCRIPTION="BLAS,CBLAS,LAPACK,LAPACKE reference implementations"
-HOMEPAGE="http://www.netlib.org/lapack/"
+HOMEPAGE="https://www.netlib.org/lapack/"
SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
next reply other threads:[~2021-02-06 21:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 21:29 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-03 4:00 [gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack/, sci-libs/lapack/files/ Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1612646946.681412c77f8c1d58962f8159eb0cd0f648888d70.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox