From e3f9d81a4a5ee62dab64f77499dd2e04a81e5f30 Mon Sep 17 00:00:00 2001 From: Nicholas Vinson Date: Mon, 15 Dec 2025 20:37:04 -0500 Subject: [PATCH] dev-cpp/eigen: C++20 compatibility updates Force early evaluation of boost::multiprecision::detail::expression-s. casting boost::multiprecision::detail::expression-s into the proper type for the Eigen methods solves the issue. Signed-off-by: Nicholas Vinson Part-of: https://github.com/gentoo/gentoo/pull/45043 Signed-off-by: Paul Zander Part-of: https://github.com/gentoo/gentoo/pull/44994 Signed-off-by: Sam James --- dev-cpp/eigen/eigen-3.4.1.ebuild | 2 ++ dev-cpp/eigen/eigen-3.4.9999.ebuild | 2 ++ dev-cpp/eigen/eigen-5.0.1.ebuild | 1 + dev-cpp/eigen/eigen-5.0.9999.ebuild | 1 + dev-cpp/eigen/files/eigen-3.4.0-c++-20.patch | 30 ++++++++++++++++++++ dev-cpp/eigen/files/eigen-5.0.1-c++-20.patch | 29 +++++++++++++++++++ 6 files changed, 65 insertions(+) create mode 100644 dev-cpp/eigen/files/eigen-3.4.0-c++-20.patch create mode 100644 dev-cpp/eigen/files/eigen-5.0.1-c++-20.patch diff --git a/dev-cpp/eigen/eigen-3.4.1.ebuild b/dev-cpp/eigen/eigen-3.4.1.ebuild index 9373cd0d32c03..e7ea43d6362d2 100644 --- a/dev-cpp/eigen/eigen-3.4.1.ebuild +++ b/dev-cpp/eigen/eigen-3.4.1.ebuild @@ -219,6 +219,8 @@ PATCHES=( "${FILESDIR}/${PN}-3.4.0-buildstring.patch" "${FILESDIR}/${PN}-3.4.1-cxxstandard-17.patch" + "${FILESDIR}/${PN}-3.4.0-c++-20.patch" + "${FILESDIR}/${PN}-3.4.1-bug1213-link-with-Eigen3-Eigen.patch" "${FILESDIR}/${PN}-5.0.1-cmake-GNUInstallDirs.patch" diff --git a/dev-cpp/eigen/eigen-3.4.9999.ebuild b/dev-cpp/eigen/eigen-3.4.9999.ebuild index 9373cd0d32c03..e7ea43d6362d2 100644 --- a/dev-cpp/eigen/eigen-3.4.9999.ebuild +++ b/dev-cpp/eigen/eigen-3.4.9999.ebuild @@ -219,6 +219,8 @@ PATCHES=( "${FILESDIR}/${PN}-3.4.0-buildstring.patch" "${FILESDIR}/${PN}-3.4.1-cxxstandard-17.patch" + "${FILESDIR}/${PN}-3.4.0-c++-20.patch" + "${FILESDIR}/${PN}-3.4.1-bug1213-link-with-Eigen3-Eigen.patch" "${FILESDIR}/${PN}-5.0.1-cmake-GNUInstallDirs.patch" diff --git a/dev-cpp/eigen/eigen-5.0.1.ebuild b/dev-cpp/eigen/eigen-5.0.1.ebuild index 6fcd9420ba667..912d2eac02323 100644 --- a/dev-cpp/eigen/eigen-5.0.1.ebuild +++ b/dev-cpp/eigen/eigen-5.0.1.ebuild @@ -221,6 +221,7 @@ PATCHES=( # PRs "${FILESDIR}/${PN}-5.0.0-doxygen-1.14.patch" + "${FILESDIR}/${PN}-5.0.1-c++-20.patch" "${FILESDIR}/${PN}-5.0.1-cmake-GNUInstallDirs.patch" "${FILESDIR}/${PN}-5.0.1-make-static-libs-optional.patch" diff --git a/dev-cpp/eigen/eigen-5.0.9999.ebuild b/dev-cpp/eigen/eigen-5.0.9999.ebuild index 6fcd9420ba667..912d2eac02323 100644 --- a/dev-cpp/eigen/eigen-5.0.9999.ebuild +++ b/dev-cpp/eigen/eigen-5.0.9999.ebuild @@ -221,6 +221,7 @@ PATCHES=( # PRs "${FILESDIR}/${PN}-5.0.0-doxygen-1.14.patch" + "${FILESDIR}/${PN}-5.0.1-c++-20.patch" "${FILESDIR}/${PN}-5.0.1-cmake-GNUInstallDirs.patch" "${FILESDIR}/${PN}-5.0.1-make-static-libs-optional.patch" diff --git a/dev-cpp/eigen/files/eigen-3.4.0-c++-20.patch b/dev-cpp/eigen/files/eigen-3.4.0-c++-20.patch new file mode 100644 index 0000000000000..39eef7dc0c0f1 --- /dev/null +++ b/dev-cpp/eigen/files/eigen-3.4.0-c++-20.patch @@ -0,0 +1,30 @@ +From: Nicholas Vinson +Date: Mon, 15 Dec 2025 20:37:04 -0500 + +--- a/Eigen/src/Eigenvalues/ComplexSchur.h ++++ b/Eigen/src/Eigenvalues/ComplexSchur.h +@@ -277,7 +277,8 @@ + using std::abs; + if ((iter == 10 || iter == 20) && iu > 1) { + // exceptional shift, taken from http://www.netlib.org/eispack/comqr.f +- return abs(numext::real(m_matT.coeff(iu,iu-1))) + abs(numext::real(m_matT.coeff(iu-1,iu-2))); ++ return ComplexSchur::ComplexScalar( ++ abs(numext::real(m_matT.coeff(iu, iu - 1))) + abs(numext::real(m_matT.coeff(iu - 1, iu - 2)))); + } + + // compute the shift as one of the eigenvalues of t, the 2x2 +--- a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h ++++ b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h +@@ -86,8 +86,8 @@ + for (Index i = 0; i < rows; i++) + mx = (std::max)(mx, std::abs(m_f(Ashifted(i, i) + avgEival, static_cast(s + r)))); + if (r != 0) + rfactorial *= RealScalar(r); +- delta = (std::max)(delta, mx / rfactorial); ++ delta = (std::max)(delta, RealScalar(mx / rfactorial)); + } + const RealScalar P_norm = P.cwiseAbs().rowwise().sum().maxCoeff(); + if (mu * delta * P_norm < NumTraits::epsilon() * F_norm) // series converged +-- +2.52.0 + diff --git a/dev-cpp/eigen/files/eigen-5.0.1-c++-20.patch b/dev-cpp/eigen/files/eigen-5.0.1-c++-20.patch new file mode 100644 index 0000000000000..c770cbe827cc8 --- /dev/null +++ b/dev-cpp/eigen/files/eigen-5.0.1-c++-20.patch @@ -0,0 +1,29 @@ +From: Nicholas Vinson +Date: Mon, 15 Dec 2025 20:37:04 -0500 + +--- a/Eigen/src/Eigenvalues/ComplexSchur.h ++++ b/Eigen/src/Eigenvalues/ComplexSchur.h +@@ -277,7 +277,8 @@ + using std::abs; + if ((iter == 10 || iter == 20) && iu > 1) { + // exceptional shift, taken from http://www.netlib.org/eispack/comqr.f +- return abs(numext::real(m_matT.coeff(iu, iu - 1))) + abs(numext::real(m_matT.coeff(iu - 1, iu - 2))); ++ return ComplexSchur::ComplexScalar( ++ abs(numext::real(m_matT.coeff(iu, iu - 1))) + abs(numext::real(m_matT.coeff(iu - 1, iu - 2)))); + } + + // compute the shift as one of the eigenvalues of t, the 2x2 +--- a/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h ++++ b/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h +@@ -86,7 +86,7 @@ + for (Index i = 0; i < rows; i++) + mx = (std::max)(mx, std::abs(m_f(Ashifted(i, i) + avgEival, static_cast(s + r)))); + if (r != 0) rfactorial *= RealScalar(r); +- delta = (std::max)(delta, mx / rfactorial); ++ delta = (std::max)(delta, RealScalar(mx / rfactorial)); + } + const RealScalar P_norm = P.cwiseAbs().rowwise().sum().maxCoeff(); + if (mu * delta * P_norm < NumTraits::epsilon() * F_norm) // series converged +-- +2.52.0 +