diff mbox series

[meta-python,6/7] python3-icu: Fix build with GCC-15

Message ID 20250505062142.3478500-6-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/7] uim: Stick to C17 | expand

Commit Message

Khem Raj May 5, 2025, 6:21 a.m. UTC 
drop is_trivial check
Fixes
| In file included from bases.cpp:32:
| arg.h:856:37: error: static assertion failed
|   856 |   static_assert(std::is_trivial<T>::value);             \
|       |                 ~~~~~~~~~~~~~~~~~~~~^~~~~
| arg.h:859:1: note: in expansion of macro '_IS_POD'
|   859 | _IS_POD(AnyPythonObject);
|       | ^~~~~~~

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ove-assert-checking-for-trivial-type.patch | 26 +++++++++++++++++++
 .../python/python3-icu_2.15.2.bb              |  3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch b/meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch
new file mode 100644
index 0000000000..4c75eb5f7b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-icu/0001-Remove-assert-checking-for-trivial-type.patch
@@ -0,0 +1,26 @@ 
+From 3d58fb48bb1cef2177aab8e291167638993495f4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 3 May 2025 21:27:34 -0700
+Subject: [PATCH] Remove assert checking for trivial type
+
+This fails with GCC-15, is_trivial is deprecated in C++26
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ arg.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arg.h b/arg.h
+index a493d11..6cb232d 100644
+--- a/arg.h
++++ b/arg.h
+@@ -853,7 +853,6 @@ public:
+ };
+ 
+ #define _IS_POD(T)                                      \
+-  static_assert(std::is_trivial<T>::value);             \
+   static_assert(std::is_standard_layout<T>::value)
+ 
+ _IS_POD(AnyPythonObject);
diff --git a/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb b/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb
index 77013330d8..d265a20975 100644
--- a/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb
+++ b/meta-python/recipes-devtools/python/python3-icu_2.15.2.bb
@@ -12,7 +12,8 @@  UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
 
 SRC_URI[sha256sum] = "561e77eedff17cec6839f26211f7a5ce3c071b776e8a0ec9d1207f46cbce598f"
 
-SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch"
+SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch \
+            file://0001-Remove-assert-checking-for-trivial-type.patch"
 
 inherit pkgconfig pypi python_setuptools_build_meta