Accepting request 951737 from science

OBS-URL: https://build.opensuse.org/request/show/951737
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eigen3?expand=0&rev=25

01_install_FindEigen3.patch

@@ -1,16 +0,0 @@
-Index: eigen-3.4.0/CMakeLists.txt
-===================================================================
---- eigen-3.4.0.orig/CMakeLists.txt
-+++ eigen-3.4.0/CMakeLists.txt
-@@ -466,6 +466,11 @@ install(FILES
-   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
-   )
- 
-+install(FILES
-+  cmake/FindEigen3.cmake
-+  DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules
-+  )
-+
- if(EIGEN_BUILD_PKGCONFIG)
-     configure_file(eigen3.pc.in eigen3.pc @ONLY)
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc

_constraints

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<constraints>
+  <overwrite>
+    <conditions>
+      <package>eigen3:docs</package>
+    </conditions>
+    <hardware>
+      <disk>
+        <size unit="G">5</size>
+      </disk>
+      <memory>
+        <size unit="G">7</size>
+      </memory>
+    </hardware>
+  </overwrite>
+</constraints>

eigen3-3.3.1-fixcmake.patch

@@ -1,13 +0,0 @@
-Index: eigen-3.4.0/CMakeLists.txt
-===================================================================
---- eigen-3.4.0.orig/CMakeLists.txt
-+++ eigen-3.4.0/CMakeLists.txt
-@@ -598,7 +598,7 @@ set ( EIGEN_VERSION_MAJOR  ${EIGEN_WORLD
- set ( EIGEN_VERSION_MINOR  ${EIGEN_MAJOR_VERSION} )
- set ( EIGEN_VERSION_PATCH  ${EIGEN_MINOR_VERSION} )
- set ( EIGEN_DEFINITIONS "")
--set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
-+set ( EIGEN_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} )
- set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
- 
- include (CMakePackageConfigHelpers)

eigen3.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Feb  1 23:06:35 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add _constraints for docs(+test) to avoid OOM build failures
+- Drop obsolete/unnecessary patches
+  * eigen3-3.3.1-fixcmake.patch (no longer has any effect)
+  * 01_install_FindEigen3.patch (CMake Config mode is preferred)
+- Fix build for ppc64le (affects test and dependent packages, e.g.
+  arpack-ng), add fix_ppc64le_always_inline_680.patch
+
 -------------------------------------------------------------------
 Fri Aug 20 01:01:50 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
 

eigen3.spec

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -41,10 +41,8 @@ URL:            http://eigen.tuxfamily.org/
 Source0:        https://gitlab.com/libeigen/eigen/-/archive/%{version}/%{srcname}-%{version}.tar.bz2
 Patch0:         0001-Disable-Altivec-for-ppc64le.patch
 Patch1:         0001-Do-stack-allignment-on-ppc.patch
-# PATCH-FIX-OPENSUSE 01_install_FindEigen3.patch asterios.dramis@gmail.com -- Install FindEigen3.cmake
-Patch3:         01_install_FindEigen3.patch
-# PATCH-FIX-OPENSUSE eigen3-3.3.1-fixcmake.patch -- Fix double {prefix} as we use INCLUDE_INSTALL_DIR with {_includedir}
-Patch4:         eigen3-3.3.1-fixcmake.patch
+# PATCH-FIX-UPSTREAM -- https://gitlab.com/libeigen/eigen/-/merge_requests/680.patch
+Patch2:         fix_ppc64le_always_inline_680.patch
 %if %{with tests}
 # SECTION Patches to fix tests
 # PATCH-FIX-UPSTREAM eigen3-googlehash-detection.patch badshah400@gmail.com -- GoogleHash needs C++11 std to compile test code and be succesfully detected
@@ -123,9 +121,9 @@ echo "HTML_TIMESTAMP = NO" >> doc/Doxyfile.in
  -DEIGEN_TEST_OPENMP:Bool=%{?with_tests:ON}%{!?with_tests:OFF}
 
 %if "%{flavor}" == ""
-make %{?_smp_mflags} all %{?with_tests:buildtests}
+%cmake_build all %{?with_tests:buildtests}
 %else
-make %{?_smp_mflags} doc
+%cmake_build doc
 %endif
 
 rm -f doc/html/*.tgz
@@ -160,7 +158,6 @@ export EIGEN_REPEAT=1
 %{_includedir}/eigen3/
 %{_datadir}/eigen3/
 %{_datadir}/pkgconfig/eigen3.pc
-%{_datadir}/cmake/Modules/FindEigen3.cmake
 
 %endif