diff -Nru eigen3-3.4.0/debian/changelog eigen3-3.4.0/debian/changelog --- eigen3-3.4.0/debian/changelog 2022-01-05 20:15:28.000000000 +0000 +++ eigen3-3.4.0/debian/changelog 2022-09-24 19:35:51.000000000 +0000 @@ -1,14 +1,22 @@ -eigen3 (3.4.0-2ubuntu2) jammy; urgency=medium +eigen3 (3.4.0-4) unstable; urgency=medium - * Disable EIGEN_ALTIVEC_DISABLE_MMA on ppc64el + [ Anton Gladky ] - -- Graham Inggs Wed, 05 Jan 2022 20:15:28 +0000 + * [8a57af0] Port EIGEN_OPTIMIZATION_BARRIER to soft float arm + * [436a6d4] Set Standards-Version: 4.6.1 -eigen3 (3.4.0-2ubuntu1) jammy; urgency=medium + [ Jose Luis Rivero ] + * [70dd6c3] Patch for default eigen_packet_wrapper constructor. + (Merged upstream: https://gitlab.com/libeigen/eigen/-/merge_requests/645) - * Reduce parallelism to avoid OOM during build + -- Anton Gladky Sat, 24 Sep 2022 21:35:51 +0200 - -- Graham Inggs Tue, 14 Dec 2021 14:47:38 +0000 +eigen3 (3.4.0-3) unstable; urgency=medium + + [ Graham Inggs ] + * [b1a6c61] Disable EIGEN_ALTIVEC_DISABLE_MMA on ppc64el. (Closes: #1006943) + + -- Anton Gladky Thu, 26 May 2022 15:27:38 +0200 eigen3 (3.4.0-2) unstable; urgency=medium diff -Nru eigen3-3.4.0/debian/control eigen3-3.4.0/debian/control --- eigen3-3.4.0/debian/control 2021-12-14 05:48:25.000000000 +0000 +++ eigen3-3.4.0/debian/control 2022-09-24 19:30:13.000000000 +0000 @@ -1,6 +1,5 @@ Source: eigen3 -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Maintainers +Maintainer: Debian Science Maintainers Uploaders: Anton Gladky Section: libdevel Priority: optional @@ -14,7 +13,7 @@ libjs-jquery, libjs-mathjax, fonts-freefont-ttf -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/science-team/eigen3 Vcs-Git: https://salsa.debian.org/science-team/eigen3.git Homepage: http://eigen.tuxfamily.org diff -Nru eigen3-3.4.0/debian/patches/08_default_eigen_packet_wrapper.patch eigen3-3.4.0/debian/patches/08_default_eigen_packet_wrapper.patch --- eigen3-3.4.0/debian/patches/08_default_eigen_packet_wrapper.patch 1970-01-01 00:00:00.000000000 +0000 +++ eigen3-3.4.0/debian/patches/08_default_eigen_packet_wrapper.patch 2022-09-24 19:17:35.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Default eigen_packet_wrapper constructor + Fixes eigen 3.4.0 warnings when building with GCC 11 for aarch64 +Origin: Antonio Sánchez +Forwarded: https://gitlab.com/libeigen/eigen/-/merge_requests/645 +Applied-Upstream: https://gitlab.com/libeigen/eigen/-/merge_requests/645 +Last-Update: 2022-02-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Eigen/src/Core/GenericPacketMath.h ++++ b/Eigen/src/Core/GenericPacketMath.h +@@ -160,7 +160,7 @@ + { + EIGEN_ALWAYS_INLINE operator T&() { return m_val; } + EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } +- EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {} ++ EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; + EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} + EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { + m_val = v; diff -Nru eigen3-3.4.0/debian/patches/20_port_EIGEN_OPTIMIZATION_BARRIER.patch eigen3-3.4.0/debian/patches/20_port_EIGEN_OPTIMIZATION_BARRIER.patch --- eigen3-3.4.0/debian/patches/20_port_EIGEN_OPTIMIZATION_BARRIER.patch 1970-01-01 00:00:00.000000000 +0000 +++ eigen3-3.4.0/debian/patches/20_port_EIGEN_OPTIMIZATION_BARRIER.patch 2022-09-24 19:24:17.000000000 +0000 @@ -0,0 +1,36 @@ +From fb05198bddcc21b97232df5f4000583d66d033b3 Mon Sep 17 00:00:00 2001 +From: David Gao +Date: Thu, 20 Jan 2022 00:44:17 +0000 +Subject: [PATCH] Port EIGEN_OPTIMIZATION_BARRIER to soft float arm + +--- + Eigen/src/Core/util/Macros.h | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h +index 32bb16805..62566eec9 100644 +--- a/Eigen/src/Core/util/Macros.h ++++ b/Eigen/src/Core/util/Macros.h +@@ -1130,8 +1130,17 @@ namespace Eigen { + // General, Altivec, VSX. + #define EIGEN_OPTIMIZATION_BARRIER(X) __asm__ ("" : "+r,v,wa" (X)); + #elif EIGEN_ARCH_ARM_OR_ARM64 +- // General, NEON. +- #define EIGEN_OPTIMIZATION_BARRIER(X) __asm__ ("" : "+g,w" (X)); ++ #ifdef __ARM_FP ++ // General, VFP or NEON. ++ // Clang doesn't like "r", ++ // error: non-trivial scalar-to-vector conversion, possible invalid ++ // constraint for vector typ ++ #define EIGEN_OPTIMIZATION_BARRIER(X) __asm__ ("" : "+g,w" (X)); ++ #else ++ // Arm without VFP or NEON. ++ // "w" constraint will not compile. ++ #define EIGEN_OPTIMIZATION_BARRIER(X) __asm__ ("" : "+g" (X)); ++ #endif + #elif EIGEN_ARCH_i386_OR_x86_64 + // General, SSE. + #define EIGEN_OPTIMIZATION_BARRIER(X) __asm__ ("" : "+g,x" (X)); +-- +GitLab + diff -Nru eigen3-3.4.0/debian/patches/series eigen3-3.4.0/debian/patches/series --- eigen3-3.4.0/debian/patches/series 2022-01-05 11:52:32.000000000 +0000 +++ eigen3-3.4.0/debian/patches/series 2022-09-24 19:20:10.000000000 +0000 @@ -1,6 +1,8 @@ #02_remove_buildtype_check.patch +08_default_eigen_packet_wrapper.patch 05_remove_html_timestamp.patch 06_remove_doc_matrix.patch 07_remove_compressed_doc.patch 12_grammar_tweak.patch eigen_mma.patch +20_port_EIGEN_OPTIMIZATION_BARRIER.patch diff -Nru eigen3-3.4.0/debian/rules eigen3-3.4.0/debian/rules --- eigen3-3.4.0/debian/rules 2021-12-14 08:06:51.000000000 +0000 +++ eigen3-3.4.0/debian/rules 2022-09-24 19:30:13.000000000 +0000 @@ -4,7 +4,7 @@ NJOBS := USE_CPUS := 1 ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) - USE_CPUS := 1 + USE_CPUS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) NJOBS := -j $(USE_CPUS) export EIGEN_MAKE_ARGS=-j$(USE_CPUS) endif