From 63fcdadc2ded0966839410db37d497e32923e764 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 2 Mar 2025 17:53:26 +0800 Subject: [PATCH] try build with cmake 4.0 --- eigen-3.3.8-port-to-newer-cmake.patch | 10 ++++++++++ eigen3.spec => eigen.spec | 20 +++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 eigen-3.3.8-port-to-newer-cmake.patch rename eigen3.spec => eigen.spec (83%) diff --git a/eigen-3.3.8-port-to-newer-cmake.patch b/eigen-3.3.8-port-to-newer-cmake.patch new file mode 100644 index 0000000..a73c2e1 --- /dev/null +++ b/eigen-3.3.8-port-to-newer-cmake.patch @@ -0,0 +1,10 @@ +--- eigen-3.3.8/CMakeLists.txt.orig 2025-03-02 17:39:25.936211200 +0800 ++++ eigen-3.3.8/CMakeLists.txt 2025-03-02 17:39:38.007119400 +0800 +@@ -1,6 +1,6 @@ + project(Eigen3) + +-cmake_minimum_required(VERSION 2.8.5) ++cmake_minimum_required(VERSION 2.8.5...${CMAKE_VERSION}) + + # guard against in-source builds + diff --git a/eigen3.spec b/eigen.spec similarity index 83% rename from eigen3.spec rename to eigen.spec index d43ddfd..41335e9 100644 --- a/eigen3.spec +++ b/eigen.spec @@ -1,14 +1,15 @@ %undefine __cmake_in_source_build -Name: eigen3 +Name: eigen Version: 3.3.8 -Release: 5 +Release: 6 Summary: A lightweight C++ template library for vector and matrix math License: MPLv2.0 and LGPLv2+ and BSD URL: http://eigen.tuxfamily.org/index.php?title=Main_Page Source0: https://gitlab.com/libeigen/eigen/-/archive/%{version}/eigen-%{version}.tar.bz2 Patch0: 0001-rebuild-and-modify-exception-error.patch +Patch1: eigen-3.3.8-port-to-newer-cmake.patch Buildarch: noarch BuildRequires: cmake @@ -19,8 +20,7 @@ BuildRequires: doxygen %description %{summary}. - -%package devel +%package -n eigen3-devel Summary: A lightweight C++ template library for vector and matrix math BuildArch: noarch # -devel subpkg only atm, compat with other distros @@ -28,7 +28,7 @@ Provides: %{name} = %{version}-%{release} # not *strictly* a -static pkg, but the results are the same Provides: %{name}-static = %{version}-%{release} -%description devel +%description -n eigen3-devel %{summary}. %prep @@ -44,12 +44,18 @@ cp -r unsupported %{buildroot}%{_includedir}/%{name}/ cp -r Eigen %{buildroot}%{_includedir}/%{name}/ %cmake_install -%files devel +%files -n eigen3-devel %license COPYING.README COPYING.BSD COPYING.MPL2 COPYING.LGPL %defattr(0644, root, root, 0755) %{_includedir}/%{name} -%{_datadir} +%{_datadir}/%{name}3 +%{_datadir}/pkgconfig/*.pc + %changelog +* Sun Mar 02 2025 Funda Wang - 3.3.8-6 +- try build with cmake 4.0 +- rename spec so that packages could be tracked + * Fri Feb 14 2025 sunhailiang - 3.3.8-5 - adopt to new cmake macro -- Gitee