mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

python3-greenlet: Fix build with gcc13

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2023-01-29 21:58:03 -08:00
parent 20bc73a86e
commit e16db79ffc
2 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch Normal file
View File

@@ -0,0 +1,56 @@
From 18fb84bb041072503b783ae03c5252f26d2216b8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 29 Jan 2023 21:42:08 -0800
Subject: [PATCH] PythonAllocator: define missing 'rebind' type
`gcc-13` added an assert to standard headers to make sure custom
allocators have intended implementation of rebind type instead
of inherited rebind. gcc change:
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
Without the fix build fails on this week's `gcc-13` as:
| In file included from ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:34,
| from ../recipe-sysroot/usr/include/c++/13.0.1/bits/basic_string.h:39,
| from ../recipe-sysroot/usr/include/c++/13.0.1/string:54,
| from src/greenlet/greenlet.cpp:10:
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<greenlet::PythonAllocator<_greenlet*>, _greenlet*, void>':
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:94:11: required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = greenlet::PythonAllocator<_greenlet*>; _Up = _greenlet*]'
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:228:8: required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = _greenlet*; _Alloc = greenlet::PythonAllocator<_greenlet*>]'
| ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:126:65: required from 'struct __gnu_cxx::__alloc_traits<greenlet::PythonAllocator<_greenlet*>, _greenlet*>::rebind<_greenlet*>'
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<_greenlet*, greenlet::PythonAllocator<_greenlet*> >'
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:423:11: required from 'class std::vector<_greenlet*, greenlet::PythonAllocator<_greenlet*> >'
| src/greenlet/greenlet_thread_state.hpp:115:16: required from here
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
| 70 | _Tp>::value,
| | ^~~~~
| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: note: 'std::integral_constant<bool, false>::value' evaluates to false
The change adds trivial `rebind` definition with expected return type
and satisfies conversion requirements.
Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/344]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/greenlet/greenlet_allocator.hpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/greenlet/greenlet_allocator.hpp b/src/greenlet/greenlet_allocator.hpp
index 666307d..beaa7ed 100644
--- a/src/greenlet/greenlet_allocator.hpp
+++ b/src/greenlet/greenlet_allocator.hpp
@@ -32,6 +32,11 @@ namespace greenlet
PythonAllocator() : std::allocator<T>() {}
+ template <class U> struct rebind
+ {
+ typedef PythonAllocator<U> other;
+ };
+
T* allocate(size_t number_objects, const void* UNUSED(hint)=0)
{
void* p;
--
2.39.1

3
meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb
View File

@@ -4,7 +4,8 @@ LICENSE = "MIT & PSF-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \
file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a"
SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch"
SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch \
file://0001-PythonAllocator-define-missing-rebind-type.patch"
SRC_URI[sha256sum] = "42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67"