import eigen3-3.4.0-1.el9

.eigen3.metadata

@@ -1 +1 @@
-516322dc3d98f7f6d20f11050da43084f68e6c71 SOURCES/eigen-3.3.9.tar.bz2
+3e8a1aa6ac5c7fafce69688242590fd365c1d3c5 SOURCES/eigen-3.4.0.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/eigen-3.3.9.tar.bz2
+SOURCES/eigen-3.4.0.tar.bz2

SOURCES/eigen3_logp.patch

@@ -1,27 +0,0 @@
-diff -rupN --no-dereference eigen-3.3.9/Eigen/src/Core/MathFunctions.h eigen-3.3.9-new/Eigen/src/Core/MathFunctions.h
---- eigen-3.3.9/Eigen/src/Core/MathFunctions.h	2020-12-04 22:53:41.000000000 +0100
-+++ eigen-3.3.9-new/Eigen/src/Core/MathFunctions.h	2021-01-19 12:32:05.328624222 +0100
-@@ -485,12 +485,22 @@ struct log1p_impl {
-     EIGEN_STATIC_ASSERT_NON_INTEGER(Scalar)
-     #if EIGEN_HAS_CXX11_MATH
-     using std::log1p;
--    #endif
-+    #else
-     using std_fallback::log1p;
-+    #endif
-     return log1p(x);
-   }
- };
- 
-+// Specialization for complex types that are not supported by std::log1p.
-+template <typename RealScalar>
-+struct log1p_impl<std::complex<RealScalar> > {
-+  EIGEN_DEVICE_FUNC static inline std::complex<RealScalar> run(
-+      const std::complex<RealScalar>& x) {
-+    EIGEN_STATIC_ASSERT_NON_INTEGER(RealScalar)
-+    return std_fallback::log1p(x);
-+  }
-+};
- 
- template<typename Scalar>
- struct log1p_retval

SPECS/eigen3.spec

@@ -10,16 +10,13 @@
 %endif
 
 
-%if 0%{?fedora} >= 33
+%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 %global blaslib flexiblas
+%global cmake_blas_flags -DBLA_VENDOR=FlexiBLAS
 %else
 %global blaslib openblas
-%endif
-
-%if 0%{?rhel} >= 8
-%bcond_with qt
-%else
-%bcond_without qt
+%global blasvar o
+%global cmake_blas_flags -DBLAS_LIBRARIES=%{_libdir}/lib%{blaslib}%{blasvar}.so
 %endif
 
 %bcond_with sparsehash
@@ -29,18 +26,14 @@
 %bcond_with metis
 
 Name:           eigen3
-Version:        3.3.9
-Release:        8%{?dist}
+Version:        3.4.0
+Release:        1%{?dist}
 Summary:        A lightweight C++ template library for vector and matrix math
 
-License:        MPLv2.0 and LGPLv2+ and BSD and Minpack
+License:        ASL 2.0 and MPLv2.0 and LGPLv2+ and BSD and Minpack
 URL:            http://eigen.tuxfamily.org/index.php?title=Main_Page
 Source0:        https://gitlab.com/libeigen/eigen/-/archive/%{version}/eigen-%{version}.tar.bz2
 
-# Backport fix for conflicting declarations of log1p
-# https://gitlab.com/libeigen/eigen/-/commit/d55d392e7b1136655b4223bea8e99cb2fe0a8afd.patch
-Patch0:         eigen3_logp.patch
-
 BuildRequires:  %{blaslib}-devel
 BuildRequires:  fftw-devel
 BuildRequires:  gmp-devel
@@ -50,9 +43,6 @@ BuildRequires:  mpfr-devel
 %{?with_suitesparse:BuildRequires:  suitesparse-devel}
 BuildRequires:  gcc-gfortran
 %{?with_SuperLU:BuildRequires:  SuperLU-devel}
-%if %{with qt}
-BuildRequires:  qt-devel
-%endif
 %{?with_scotch:BuildRequires:  scotch-devel}
 %{?with_metis:BuildRequires:  metis-devel}
 
@@ -93,12 +83,13 @@ Developer documentation for Eigen.
 
 %build
 %cmake \
-    -DINCLUDE_INSTALL_DIR=include/%{name} \
-    -DBLAS_LIBRARIES="-l%{blaslib}" \
+    -DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
+    %{cmake_blas_flags} \
     %{?with_SuperLU:-DSUPERLU_INCLUDES=%{_includedir}/SuperLU} \
     %{?with_scotch:-DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch"} \
     %{?with_metis:-DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis"} \
-    -DCMAKEPACKAGE_INSTALL_DIR=share/cmake/%{name}
+    -DCMAKEPACKAGE_INSTALL_DIR=%{_datadir}/cmake/%{name} \
+    -DEIGEN_TEST_CXX11=ON
 
 %cmake_build
 %cmake_build --target doc
@@ -112,14 +103,13 @@ rm -f %{_vpath_builddir}/doc/html/unsupported/installdox
 
 
 %check
-# Run tests but make failures non-fatal. Note that upstream doesn't expect the
-# tests to pass consistently since they're seeded randomly.
+# Test fail to build due to compiler crashes
 #cmake_build --target buildtests
-#cmake_build --target test -- test ARGS="-V" || :
+#ctest
 
 
 %files devel
-%license COPYING.README COPYING.BSD COPYING.MPL2 COPYING.LGPL COPYING.MINPACK
+%license COPYING.README COPYING.APACHE COPYING.BSD COPYING.MPL2 COPYING.GPL COPYING.LGPL COPYING.MINPACK
 %{_includedir}/%{name}
 %{_datadir}/cmake/%{name}
 %{_datadir}/pkgconfig/%{name}.pc
@@ -129,6 +119,10 @@ rm -f %{_vpath_builddir}/doc/html/unsupported/installdox
 
 
 %changelog
+* Wed Feb 16 2022 Jiri Kucera <jkucera@redhat.com> - 3.4.0-1
+- Update to 3.4.0
+  Resolves: #2032423
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.3.9-8
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688