summaryrefslogtreecommitdiff
diff options
authorMichał Górny <mgorny@gentoo.org>2025-08-19 20:44:29 +0200
committerMichał Górny <mgorny@gentoo.org>2025-08-19 21:04:53 +0200
commitc5ed5510d3eabea7503eecf6dc77710f4f0db389 (patch)
treec1d003df501b24cd8c06394d1eff1383ac7edbdf /sci-libs/lapack
parentdev-dotnet/dotnet-runtime-nugets: Stabilize 9.0.7 arm64, #961787 (diff)
downloadgentoo-c5ed5510d3eabea7503eecf6dc77710f4f0db389.tar.gz
gentoo-c5ed5510d3eabea7503eecf6dc77710f4f0db389.tar.bz2
gentoo-c5ed5510d3eabea7503eecf6dc77710f4f0db389.zip
sci-libs/lapack: Backport more upstream reflow fixes
Closes: https://bugs.gentoo.org/961788 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sci-libs/lapack')
-rw-r--r--sci-libs/lapack/files/lapack-3.12.1-broken-flow-trois.patch77
-rw-r--r--sci-libs/lapack/lapack-3.12.1-r1.ebuild116
2 files changed, 193 insertions, 0 deletions
diff --git a/sci-libs/lapack/files/lapack-3.12.1-broken-flow-trois.patch b/sci-libs/lapack/files/lapack-3.12.1-broken-flow-trois.patch
new file mode 100644
index 000000000000..3496ba9a8907
--- /dev/null
+++ b/sci-libs/lapack/files/lapack-3.12.1-broken-flow-trois.patch
@@ -0,0 +1,77 @@
+https://bugs.gentoo.org/961788
+https://github.com/Reference-LAPACK/lapack/pull/1099
+
+From 304fa305e85190c934e78eae75c7b092fcfd54c1 Mon Sep 17 00:00:00 2001
+From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
+Date: Sun, 19 Jan 2025 22:55:52 +0100
+Subject: [PATCH 1/3] Fix line reflow on addition of _64 symbol suffixes
+
+---
+ SRC/DEPRECATED/cgelsx.f | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SRC/DEPRECATED/cgelsx.f b/SRC/DEPRECATED/cgelsx.f
+index b55fe1565..7281a0668 100644
+--- a/SRC/DEPRECATED/cgelsx.f
++++ b/SRC/DEPRECATED/cgelsx.f
+@@ -364,8 +364,8 @@ SUBROUTINE CGELSX( M, N, NRHS, A, LDA, B, LDB, JPVT, RCOND,
+ *
+ * B(1:M,1:NRHS) := Q**H * B(1:M,1:NRHS)
+ *
+- CALL CUNM2R( 'Left', 'Conjugate transpose', M, NRHS, MN, A, LDA,
+- $ WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
++ CALL CUNM2R( 'Left', 'Conjugate transpose', M, NRHS, MN, A,
++ $ LDA, WORK( 1 ), B, LDB, WORK( 2*MN+1 ), INFO )
+ *
+ * workspace NRHS
+ *
+
+From bc0c38f247f90f815a93f6ca0829004120745da4 Mon Sep 17 00:00:00 2001
+From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
+Date: Sun, 19 Jan 2025 22:58:19 +0100
+Subject: [PATCH 2/3] Fix line reflow on addition of _64 symbol suffix
+
+---
+ SRC/DEPRECATED/dgeqpf.f | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SRC/DEPRECATED/dgeqpf.f b/SRC/DEPRECATED/dgeqpf.f
+index 36f6fb50e..067da29d0 100644
+--- a/SRC/DEPRECATED/dgeqpf.f
++++ b/SRC/DEPRECATED/dgeqpf.f
+@@ -218,8 +218,8 @@ SUBROUTINE DGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
+ MA = MIN( ITEMP, M )
+ CALL DGEQR2( M, MA, A, LDA, TAU, WORK, INFO )
+ IF( MA.LT.N ) THEN
+- CALL DORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA, TAU,
+- $ A( 1, MA+1 ), LDA, WORK, INFO )
++ CALL DORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA,
++ $ TAU, A( 1, MA+1 ), LDA, WORK, INFO )
+ END IF
+ END IF
+ *
+
+From 3c209c6bdf524869d18d00119aeae4962740c3b3 Mon Sep 17 00:00:00 2001
+From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
+Date: Sun, 19 Jan 2025 22:59:21 +0100
+Subject: [PATCH 3/3] Fix line reflow on addition of _64 symbol suffix
+
+---
+ SRC/DEPRECATED/sgeqpf.f | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SRC/DEPRECATED/sgeqpf.f b/SRC/DEPRECATED/sgeqpf.f
+index 7963bd8e7..f74a084a0 100644
+--- a/SRC/DEPRECATED/sgeqpf.f
++++ b/SRC/DEPRECATED/sgeqpf.f
+@@ -218,8 +218,8 @@ SUBROUTINE SGEQPF( M, N, A, LDA, JPVT, TAU, WORK, INFO )
+ MA = MIN( ITEMP, M )
+ CALL SGEQR2( M, MA, A, LDA, TAU, WORK, INFO )
+ IF( MA.LT.N ) THEN
+- CALL SORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA, TAU,
+- $ A( 1, MA+1 ), LDA, WORK, INFO )
++ CALL SORM2R( 'Left', 'Transpose', M, N-MA, MA, A, LDA,
++ $ TAU, A( 1, MA+1 ), LDA, WORK, INFO )
+ END IF
+ END IF
+ *
diff --git a/sci-libs/lapack/lapack-3.12.1-r1.ebuild b/sci-libs/lapack/lapack-3.12.1-r1.ebuild
new file mode 100644
index 000000000000..9799c01c0f29
--- /dev/null
+++ b/sci-libs/lapack/lapack-3.12.1-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Some additional tests are run if Python is found
+PYTHON_COMPAT=( python3_{11..14} )
+inherit cmake flag-o-matic fortran-2 python-any-r1
+
+DESCRIPTION="BLAS, CBLAS, LAPACK, LAPACKE reference implementations"
+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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
+# TODO: static-libs 64bit-index
+IUSE="lapacke deprecated doc eselect-ldso test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !app-eselect/eselect-cblas
+ virtual/fortran
+ eselect-ldso? (
+ >=app-eselect/eselect-blas-0.2
+ >=app-eselect/eselect-lapack-0.2
+ )
+ doc? ( app-doc/blas-docs )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.12.1-broken-flow.patch
+ "${FILESDIR}"/${PN}-3.12.1-broken-flow-deux.patch
+ "${FILESDIR}"/${PN}-3.12.1-broken-flow-trois.patch
+)
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ # bug #878891
+ filter-lto
+
+ local mycmakeargs=(
+ -DCBLAS=ON
+ -DLAPACKE=$(usex lapacke)
+ -DBUILD_DEPRECATED=$(usex deprecated)
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTING=$(usex test)
+ -DLAPACK_TESTING_USE_PYTHON=$(usex test)
+ # Breaks cross
+ -DTEST_FORTRAN_COMPILER=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ use eselect-ldso || return
+ # Create private lib directory for eselect::blas (ld.so.conf)
+ dodir /usr/$(get_libdir)/blas/reference
+ dosym -r /usr/$(get_libdir)/libblas.so /usr/$(get_libdir)/blas/reference/libblas.so
+ dosym -r /usr/$(get_libdir)/libblas.so.3 /usr/$(get_libdir)/blas/reference/libblas.so.3
+ dosym -r /usr/$(get_libdir)/libcblas.so /usr/$(get_libdir)/blas/reference/libcblas.so
+ dosym -r /usr/$(get_libdir)/libcblas.so.3 /usr/$(get_libdir)/blas/reference/libcblas.so.3
+
+ # Create private lib directory for eselect::lapack (ld.so.conf)
+ dodir /usr/$(get_libdir)/lapack/reference
+ dosym -r /usr/$(get_libdir)/liblapack.so /usr/$(get_libdir)/lapack/reference/liblapack.so
+ dosym -r /usr/$(get_libdir)/liblapack.so.3 /usr/$(get_libdir)/lapack/reference/liblapack.so.3
+}
+
+pkg_postinst() {
+ use eselect-ldso || return
+
+ local me=reference libdir=$(get_libdir)
+ # check eselect-blas
+ eselect blas add ${libdir} "${EPREFIX}"/usr/${libdir}/blas/${me} ${me}
+ local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_blas} == ${me} || -z ${current_blas} ]]; then
+ eselect blas set ${libdir} ${me}
+ elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+ else
+ elog "Current eselect: BLAS ($libdir) -> [${current_blas}]."
+ elog "To use blas [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect blas set ${libdir} ${me}"
+ fi
+
+ # check eselect-lapack
+ eselect lapack add ${libdir} "${EPREFIX}"/usr/${libdir}/lapack/${me} ${me}
+ local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
+ if [[ ${current_lapack} == ${me} || -z ${current_lapack} ]]; then
+ eselect lapack set ${libdir} ${me}
+ elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+ else
+ elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
+ elog "To use lapack [${me}] implementation, you have to issue (as root):"
+ elog "\t eselect lapack set ${libdir} ${me}"
+ fi
+}
+
+pkg_postrm() {
+ use eselect-ldso || return
+
+ eselect blas validate
+ eselect lapack validate
+}