diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2025-10-14 02:04:12 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-10-13 23:47:41 -0700 |
| commit | e1915f54f1db1208152148973e9965570972bbc7 (patch) | |
| tree | 5300a566ed2740c89e7f3fe5d3195c9db85bc15a | |
| parent | 2ac3baccd8e6d367c090b74cb32306634eda489a (diff) | |
| download | meta-openembedded-e1915f54f1db1208152148973e9965570972bbc7.tar.gz | |
libeigen: Backport a patch to make eigen_packet_wrapper trivial for c++11
A corresponding patch was removed with the upgrade to 3.4.1 since it had
been integrated upstream. However, it had also been reverted again,
which was not noticed.
This backports a subsequent fix for the problem.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb | 2 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch new file mode 100644 index 0000000000..855bf01ae9 --- /dev/null +++ b/meta-oe/recipes-support/libeigen/libeigen/0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | From 0295f81a835ef69e2bacd9e75ab5782eca398720 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com> | ||
| 3 | Date: Thu, 2 Oct 2025 17:53:19 +0000 | ||
| 4 | Subject: [PATCH] Make `eigen_packet_wrapper` trivial for c++11. | ||
| 5 | |||
| 6 | Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/commit/0295f81a835ef69e2bacd9e75ab5782eca398720] | ||
| 7 | --- | ||
| 8 | Eigen/src/Core/GenericPacketMath.h | 4 ++++ | ||
| 9 | 1 file changed, 4 insertions(+) | ||
| 10 | |||
| 11 | diff --git a/Eigen/src/Core/GenericPacketMath.h b/Eigen/src/Core/GenericPacketMath.h | ||
| 12 | index af45f3936..4aeb77de8 100644 | ||
| 13 | --- a/Eigen/src/Core/GenericPacketMath.h | ||
| 14 | +++ b/Eigen/src/Core/GenericPacketMath.h | ||
| 15 | @@ -160,7 +160,11 @@ struct eigen_packet_wrapper | ||
| 16 | { | ||
| 17 | EIGEN_ALWAYS_INLINE operator T&() { return m_val; } | ||
| 18 | EIGEN_ALWAYS_INLINE operator const T&() const { return m_val; } | ||
| 19 | +#if EIGEN_HAS_CXX11 | ||
| 20 | + EIGEN_ALWAYS_INLINE eigen_packet_wrapper() = default; | ||
| 21 | +#else | ||
| 22 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper() {}; | ||
| 23 | +#endif | ||
| 24 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper(const T &v) : m_val(v) {} | ||
| 25 | EIGEN_ALWAYS_INLINE eigen_packet_wrapper& operator=(const T &v) { | ||
| 26 | m_val = v; | ||
diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb index c5421e4621..5cb7407608 100644 --- a/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb +++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.1.bb | |||
| @@ -14,11 +14,11 @@ LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ | |||
| 14 | 14 | ||
| 15 | SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ | 15 | SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ |
| 16 | file://0001-Remove-LGPL-Code-and-references.patch \ | 16 | file://0001-Remove-LGPL-Code-and-references.patch \ |
| 17 | file://0001-Make-eigen_packet_wrapper-trivial-for-c-11.patch \ | ||
| 17 | " | 18 | " |
| 18 | 19 | ||
| 19 | SRCREV = "d71c30c47858effcbd39967097a2d99ee48db464" | 20 | SRCREV = "d71c30c47858effcbd39967097a2d99ee48db464" |
| 20 | 21 | ||
| 21 | |||
| 22 | inherit cmake | 22 | inherit cmake |
| 23 | 23 | ||
| 24 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
