From 7716988db75aad7db90e0182b6e54bb8009c9b23c512bb6761690b30e3b08ccd Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Wed, 8 Mar 2017 23:59:11 +0000 Subject: [PATCH] Accepting request 477847 from home:adra:branches:science Update to version 3.3.3, Added new build requirements, Rebased patches to apply cleanly OBS-URL: https://build.opensuse.org/request/show/477847 OBS-URL: https://build.opensuse.org/package/show/science/eigen3?expand=0&rev=6 --- 0001-Disable-Altivec-for-ppc64le.patch | 18 +++++++++--------- 0001-Do-stack-allignment-on-ppc.patch | 26 +++++++++++++------------- 3.2.9.tar.bz2 | 3 --- eigen3-3.3.3.tar.bz2 | 3 +++ eigen3.changes | 12 ++++++++++++ eigen3.spec | 12 +++++++++--- 6 files changed, 46 insertions(+), 28 deletions(-) delete mode 100644 3.2.9.tar.bz2 create mode 100644 eigen3-3.3.3.tar.bz2 diff --git a/0001-Disable-Altivec-for-ppc64le.patch b/0001-Disable-Altivec-for-ppc64le.patch index 67d5f11..7aa26cf 100644 --- a/0001-Disable-Altivec-for-ppc64le.patch +++ b/0001-Disable-Altivec-for-ppc64le.patch @@ -4,19 +4,19 @@ Date: Wed, 30 Jul 2014 17:55:03 +0200 Subject: [PATCH] Disable Altivec for ppc64le --- - Eigen/Core | 2 +- + Eigen/Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: eigen-eigen-bdd17ee3b1b3/Eigen/Core +Index: eigen-eigen-67e894c6cd8f/Eigen/Core =================================================================== ---- eigen-eigen-bdd17ee3b1b3.orig/Eigen/Core -+++ eigen-eigen-bdd17ee3b1b3/Eigen/Core -@@ -114,7 +114,7 @@ - #endif - #endif - } // end extern "C" +--- eigen-eigen-67e894c6cd8f.orig/Eigen/Core ++++ eigen-eigen-67e894c6cd8f/Eigen/Core +@@ -201,7 +201,7 @@ + #undef bool + #undef vector + #undef pixel - #elif defined __ALTIVEC__ -+ #elif defined __ALTIVEC__ && _CALL_ELF != 2 ++ #elif defined __ALTIVEC__ && _CALL_ELF != 2 #define EIGEN_VECTORIZE #define EIGEN_VECTORIZE_ALTIVEC #include diff --git a/0001-Do-stack-allignment-on-ppc.patch b/0001-Do-stack-allignment-on-ppc.patch index c448de8..0c69dd3 100644 --- a/0001-Do-stack-allignment-on-ppc.patch +++ b/0001-Do-stack-allignment-on-ppc.patch @@ -4,19 +4,19 @@ Date: Thu, 31 Jul 2014 12:51:13 +0000 Subject: [PATCH] Do stack allignment on ppc --- - Eigen/src/Core/util/Macros.h | 2 +- + Eigen/src/Core/util/Macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: eigen-eigen-bdd17ee3b1b3/Eigen/src/Core/util/Macros.h +Index: eigen-eigen-67e894c6cd8f/Eigen/src/Core/util/Macros.h =================================================================== ---- eigen-eigen-bdd17ee3b1b3.orig/Eigen/src/Core/util/Macros.h -+++ eigen-eigen-bdd17ee3b1b3/Eigen/src/Core/util/Macros.h -@@ -50,7 +50,7 @@ - // Only static alignment is really problematic (relies on nonstandard compiler extensions that don't - // work everywhere, for example don't work on GCC/ARM), try to keep heap alignment even - // when we have to disable static alignment. --#if defined(__GNUC__) && !(defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined(__ia64__)) -+#if defined(__GNUC__) && !(defined(__i386__) || defined(__x86_64__) || defined(__ia64__)) - #define EIGEN_GCC_AND_ARCH_DOESNT_WANT_STACK_ALIGNMENT 1 - #else - #define EIGEN_GCC_AND_ARCH_DOESNT_WANT_STACK_ALIGNMENT 0 +--- eigen-eigen-67e894c6cd8f.orig/Eigen/src/Core/util/Macros.h ++++ eigen-eigen-67e894c6cd8f/Eigen/src/Core/util/Macros.h +@@ -701,7 +701,7 @@ namespace Eigen { + // certain common platform (compiler+architecture combinations) to avoid these problems. + // Only static alignment is really problematic (relies on nonstandard compiler extensions), + // try to keep heap alignment even when we have to disable static alignment. +- #if EIGEN_COMP_GNUC && !(EIGEN_ARCH_i386_OR_x86_64 || EIGEN_ARCH_ARM_OR_ARM64 || EIGEN_ARCH_PPC || EIGEN_ARCH_IA64) ++ #if EIGEN_COMP_GNUC && !(EIGEN_ARCH_i386_OR_x86_64 || EIGEN_ARCH_ARM_OR_ARM64 || EIGEN_ARCH_IA64) + #define EIGEN_GCC_AND_ARCH_DOESNT_WANT_STACK_ALIGNMENT 1 + #elif EIGEN_ARCH_ARM_OR_ARM64 && EIGEN_COMP_GNUC_STRICT && EIGEN_GNUC_AT_MOST(4, 6) + // Old versions of GCC on ARM, at least 4.4, were once seen to have buggy static alignment support. diff --git a/3.2.9.tar.bz2 b/3.2.9.tar.bz2 deleted file mode 100644 index daa2722..0000000 --- a/3.2.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d1e036ec1ed4f4805d5c6752b76072d67538889f4003fadf2f6e00a825845ff -size 1163762 diff --git a/eigen3-3.3.3.tar.bz2 b/eigen3-3.3.3.tar.bz2 new file mode 100644 index 0000000..300ffd2 --- /dev/null +++ b/eigen3-3.3.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4143fc45e4454b4b98fcea3516b3a79b8cdb3bc7fadf996d088c6a0d805fea1 +size 1642001 diff --git a/eigen3.changes b/eigen3.changes index 6f3de0b..67ec40d 100644 --- a/eigen3.changes +++ b/eigen3.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Mar 7 21:57:13 UTC 2017 - asterios.dramis@gmail.com + +- Update to version 3.3.3: + * Lots of changes. See + http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.3 + for details. +- Added new build requirements libboost_headers-devel for + Tumbleweed and boost-devel for openSUSE <= 13.2. +- Rebased 0001-Disable-Altivec-for-ppc64le.patch and + 0001-Do-stack-allignment-on-ppc.patch to apply cleanly. + ------------------------------------------------------------------- Wed Jan 4 08:49:33 UTC 2017 - olaf@aepfle.de diff --git a/eigen3.spec b/eigen3.spec index fbb951c..13a3ddb 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -17,13 +17,13 @@ Name: eigen3 -Version: 3.2.9 +Version: 3.3.3 Release: 0 Summary: C++ Template Library for Linear Algebra License: MPL-2.0 and LGPL-2.1+ and BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://eigen.tuxfamily.org/ -Source0: https://bitbucket.org/eigen/eigen/get/%{version}.tar.bz2 +Source0: https://bitbucket.org/eigen/eigen/get/%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 Patch0: 0001-Disable-Altivec-for-ppc64le.patch Patch1: 0001-Do-stack-allignment-on-ppc.patch # PATCH-FIX-OPENSUSE eigen_pkgconfig.patch asterios.dramis@gmail.com -- Fix pkg-config file includedir @@ -43,6 +43,11 @@ BuildRequires: gmp-devel BuildRequires: graphviz BuildRequires: graphviz-gd BuildRequires: gsl-devel +%if 0%{?suse_version} > 1320 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif BuildRequires: libqt4-devel BuildRequires: mpfr-devel BuildRequires: pkg-config @@ -73,7 +78,7 @@ Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. %prep -%setup -q -n eigen-eigen-dc6cfdf9bcec +%setup -q -n eigen-eigen-67e894c6cd8f %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -100,6 +105,7 @@ make %{?_smp_mflags} all doc %defattr(-,root,root,-) %doc build/doc/html/ COPYING.* %{_includedir}/eigen3/ +%{_datadir}/eigen3/ %{_datadir}/pkgconfig/eigen3.pc %{_datadir}/cmake/Modules/FindEigen3.cmake