summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch56
-rw-r--r--meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch247
-rw-r--r--meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch31
-rw-r--r--meta-python/recipes-devtools/python/python3-greenlet_2.0.2.bb (renamed from meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb)6
4 files changed, 249 insertions, 91 deletions
diff --git a/meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch b/meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch
deleted file mode 100644
index 01092025de..0000000000
--- a/meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 18fb84bb041072503b783ae03c5252f26d2216b8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 29 Jan 2023 21:42:08 -0800
4Subject: [PATCH] PythonAllocator: define missing 'rebind' type
5
6`gcc-13` added an assert to standard headers to make sure custom
7allocators have intended implementation of rebind type instead
8of inherited rebind. gcc change:
9 https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
10
11Without the fix build fails on this week's `gcc-13` as:
12
13| In file included from ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:34,
14| from ../recipe-sysroot/usr/include/c++/13.0.1/bits/basic_string.h:39,
15| from ../recipe-sysroot/usr/include/c++/13.0.1/string:54,
16| from src/greenlet/greenlet.cpp:10:
17| ../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>':
18| ../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*]'
19| ../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*>]'
20| ../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*>'
21| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:88:21: required from 'struct std::_Vector_base<_greenlet*, greenlet::PythonAllocator<_greenlet*> >'
22| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:423:11: required from 'class std::vector<_greenlet*, greenlet::PythonAllocator<_greenlet*> >'
23| src/greenlet/greenlet_thread_state.hpp:115:16: required from here
24| ../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
25| 70 | _Tp>::value,
26| | ^~~~~
27| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: note: 'std::integral_constant<bool, false>::value' evaluates to false
28
29The change adds trivial `rebind` definition with expected return type
30and satisfies conversion requirements.
31
32Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/344]
33Signed-off-by: Khem Raj <raj.khem@gmail.com>
34---
35 src/greenlet/greenlet_allocator.hpp | 5 +++++
36 1 file changed, 5 insertions(+)
37
38diff --git a/src/greenlet/greenlet_allocator.hpp b/src/greenlet/greenlet_allocator.hpp
39index 666307d..beaa7ed 100644
40--- a/src/greenlet/greenlet_allocator.hpp
41+++ b/src/greenlet/greenlet_allocator.hpp
42@@ -32,6 +32,11 @@ namespace greenlet
43
44 PythonAllocator() : std::allocator<T>() {}
45
46+ template <class U> struct rebind
47+ {
48+ typedef PythonAllocator<U> other;
49+ };
50+
51 T* allocate(size_t number_objects, const void* UNUSED(hint)=0)
52 {
53 void* p;
54--
552.39.1
56
diff --git a/meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch b/meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch
new file mode 100644
index 0000000000..2a6ddd4726
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-greenlet/0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch
@@ -0,0 +1,247 @@
1From 74d8c5ecdc677a7a412c7f782fe8488a5d987333 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 5 Feb 2023 19:05:45 -0800
4Subject: [PATCH] cleanup: Drop using 'register' storage class keyword everywhere
5
6This has been dropped in c++17 and newer
7
8Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/347]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/greenlet/platform/switch_alpha_unix.h | 4 ++--
12 src/greenlet/platform/switch_arm32_gcc.h | 2 +-
13 src/greenlet/platform/switch_arm32_ios.h | 2 +-
14 src/greenlet/platform/switch_csky_gcc.h | 2 +-
15 src/greenlet/platform/switch_mips_unix.h | 4 ++--
16 src/greenlet/platform/switch_ppc64_aix.h | 4 ++--
17 src/greenlet/platform/switch_ppc64_linux.h | 4 ++--
18 src/greenlet/platform/switch_ppc_aix.h | 4 ++--
19 src/greenlet/platform/switch_ppc_linux.h | 4 ++--
20 src/greenlet/platform/switch_ppc_macosx.h | 4 ++--
21 src/greenlet/platform/switch_ppc_unix.h | 4 ++--
22 src/greenlet/platform/switch_s390_unix.h | 4 ++--
23 src/greenlet/platform/switch_sparc_sun_gcc.h | 4 ++--
24 src/greenlet/platform/switch_x32_unix.h | 4 ++--
25 src/greenlet/platform/switch_x86_unix.h | 2 +-
26 15 files changed, 26 insertions(+), 26 deletions(-)
27
28diff --git a/src/greenlet/platform/switch_alpha_unix.h b/src/greenlet/platform/switch_alpha_unix.h
29index 216619f..7e07abf 100644
30--- a/src/greenlet/platform/switch_alpha_unix.h
31+++ b/src/greenlet/platform/switch_alpha_unix.h
32@@ -9,8 +9,8 @@
33 static int
34 slp_switch(void)
35 {
36- register int ret;
37- register long *stackref, stsizediff;
38+ int ret;
39+ long *stackref, stsizediff;
40 __asm__ volatile ("" : : : REGS_TO_SAVE);
41 __asm__ volatile ("mov $30, %0" : "=r" (stackref) : );
42 {
43diff --git a/src/greenlet/platform/switch_arm32_gcc.h b/src/greenlet/platform/switch_arm32_gcc.h
44index 035d6b9..655003a 100644
45--- a/src/greenlet/platform/switch_arm32_gcc.h
46+++ b/src/greenlet/platform/switch_arm32_gcc.h
47@@ -56,7 +56,7 @@ __attribute__((optimize("no-omit-frame-pointer")))
48 slp_switch(void)
49 {
50 void *fp;
51- register int *stackref, stsizediff;
52+ int *stackref, stsizediff;
53 int result;
54 __asm__ volatile ("" : : : REGS_TO_SAVE);
55 __asm__ volatile ("mov r0," REG_FP "\n\tstr r0,%0" : "=m" (fp) : : "r0");
56diff --git a/src/greenlet/platform/switch_arm32_ios.h b/src/greenlet/platform/switch_arm32_ios.h
57index e993707..9e640e1 100644
58--- a/src/greenlet/platform/switch_arm32_ios.h
59+++ b/src/greenlet/platform/switch_arm32_ios.h
60@@ -38,7 +38,7 @@ __attribute__((optimize("no-omit-frame-pointer")))
61 slp_switch(void)
62 {
63 void *fp;
64- register int *stackref, stsizediff, result;
65+ int *stackref, stsizediff, result;
66 __asm__ volatile ("" : : : REGS_TO_SAVE);
67 __asm__ volatile ("str " REG_FP ",%0" : "=m" (fp));
68 __asm__ ("mov %0," REG_SP : "=r" (stackref));
69diff --git a/src/greenlet/platform/switch_csky_gcc.h b/src/greenlet/platform/switch_csky_gcc.h
70index 7486b94..ac469d3 100644
71--- a/src/greenlet/platform/switch_csky_gcc.h
72+++ b/src/greenlet/platform/switch_csky_gcc.h
73@@ -23,7 +23,7 @@ __attribute__((optimize("no-omit-frame-pointer")))
74 #endif
75 slp_switch(void)
76 {
77- register int *stackref, stsizediff;
78+ int *stackref, stsizediff;
79 int result;
80
81 __asm__ volatile ("" : : : REGS_TO_SAVE);
82diff --git a/src/greenlet/platform/switch_mips_unix.h b/src/greenlet/platform/switch_mips_unix.h
83index 1916b26..b9003e9 100644
84--- a/src/greenlet/platform/switch_mips_unix.h
85+++ b/src/greenlet/platform/switch_mips_unix.h
86@@ -19,8 +19,8 @@
87 static int
88 slp_switch(void)
89 {
90- register int err;
91- register int *stackref, stsizediff;
92+ int err;
93+ int *stackref, stsizediff;
94 #ifdef __mips64
95 uint64_t gpsave;
96 #endif
97diff --git a/src/greenlet/platform/switch_ppc64_aix.h b/src/greenlet/platform/switch_ppc64_aix.h
98index e07b8de..e7e0b87 100644
99--- a/src/greenlet/platform/switch_ppc64_aix.h
100+++ b/src/greenlet/platform/switch_ppc64_aix.h
101@@ -74,8 +74,8 @@
102 static int
103 slp_switch(void)
104 {
105- register int err;
106- register long *stackref, stsizediff;
107+ int err;
108+ long *stackref, stsizediff;
109 void * toc;
110 void * r30;
111 __asm__ volatile ("" : : : REGS_TO_SAVE);
112diff --git a/src/greenlet/platform/switch_ppc64_linux.h b/src/greenlet/platform/switch_ppc64_linux.h
113index 88e6847..3c324d0 100644
114--- a/src/greenlet/platform/switch_ppc64_linux.h
115+++ b/src/greenlet/platform/switch_ppc64_linux.h
116@@ -76,8 +76,8 @@
117 static int
118 slp_switch(void)
119 {
120- register int err;
121- register long *stackref, stsizediff;
122+ int err;
123+ long *stackref, stsizediff;
124 void * toc;
125 void * r30;
126 __asm__ volatile ("" : : : REGS_TO_SAVE);
127diff --git a/src/greenlet/platform/switch_ppc_aix.h b/src/greenlet/platform/switch_ppc_aix.h
128index c7d476f..6d93c13 100644
129--- a/src/greenlet/platform/switch_ppc_aix.h
130+++ b/src/greenlet/platform/switch_ppc_aix.h
131@@ -53,8 +53,8 @@
132 static int
133 slp_switch(void)
134 {
135- register int err;
136- register int *stackref, stsizediff;
137+ int err;
138+ int *stackref, stsizediff;
139 __asm__ volatile ("" : : : REGS_TO_SAVE);
140 __asm__ ("mr %0, 1" : "=r" (stackref) : );
141 {
142diff --git a/src/greenlet/platform/switch_ppc_linux.h b/src/greenlet/platform/switch_ppc_linux.h
143index 0a71255..e83ad70 100644
144--- a/src/greenlet/platform/switch_ppc_linux.h
145+++ b/src/greenlet/platform/switch_ppc_linux.h
146@@ -49,8 +49,8 @@
147 static int
148 slp_switch(void)
149 {
150- register int err;
151- register int *stackref, stsizediff;
152+ int err;
153+ int *stackref, stsizediff;
154 __asm__ volatile ("" : : : REGS_TO_SAVE);
155 __asm__ ("mr %0, 1" : "=r" (stackref) : );
156 {
157diff --git a/src/greenlet/platform/switch_ppc_macosx.h b/src/greenlet/platform/switch_ppc_macosx.h
158index 56e573f..d6e5a03 100644
159--- a/src/greenlet/platform/switch_ppc_macosx.h
160+++ b/src/greenlet/platform/switch_ppc_macosx.h
161@@ -46,8 +46,8 @@
162 static int
163 slp_switch(void)
164 {
165- register int err;
166- register int *stackref, stsizediff;
167+ int err;
168+ int *stackref, stsizediff;
169 __asm__ volatile ("" : : : REGS_TO_SAVE);
170 __asm__ ("; asm block 2\n\tmr %0, r1" : "=g" (stackref) : );
171 {
172diff --git a/src/greenlet/platform/switch_ppc_unix.h b/src/greenlet/platform/switch_ppc_unix.h
173index 2b3d307..ca590a5 100644
174--- a/src/greenlet/platform/switch_ppc_unix.h
175+++ b/src/greenlet/platform/switch_ppc_unix.h
176@@ -47,8 +47,8 @@
177 static int
178 slp_switch(void)
179 {
180- register int err;
181- register int *stackref, stsizediff;
182+ int err;
183+ int *stackref, stsizediff;
184 __asm__ volatile ("" : : : REGS_TO_SAVE);
185 __asm__ ("mr %0, 1" : "=g" (stackref) : );
186 {
187diff --git a/src/greenlet/platform/switch_s390_unix.h b/src/greenlet/platform/switch_s390_unix.h
188index 6641854..9199367 100644
189--- a/src/greenlet/platform/switch_s390_unix.h
190+++ b/src/greenlet/platform/switch_s390_unix.h
191@@ -36,8 +36,8 @@
192 static int
193 slp_switch(void)
194 {
195- register int ret;
196- register long *stackref, stsizediff;
197+ int ret;
198+ long *stackref, stsizediff;
199 __asm__ volatile ("" : : : REGS_TO_SAVE);
200 #ifdef __s390x__
201 __asm__ volatile ("lgr %0, 15" : "=r" (stackref) : );
202diff --git a/src/greenlet/platform/switch_sparc_sun_gcc.h b/src/greenlet/platform/switch_sparc_sun_gcc.h
203index 652b57f..96990c3 100644
204--- a/src/greenlet/platform/switch_sparc_sun_gcc.h
205+++ b/src/greenlet/platform/switch_sparc_sun_gcc.h
206@@ -51,8 +51,8 @@
207 static int
208 slp_switch(void)
209 {
210- register int err;
211- register int *stackref, stsizediff;
212+ int err;
213+ int *stackref, stsizediff;
214
215 /* Put current stack pointer into stackref.
216 * Register spilling is done in save/restore.
217diff --git a/src/greenlet/platform/switch_x32_unix.h b/src/greenlet/platform/switch_x32_unix.h
218index cb14ec1..893369c 100644
219--- a/src/greenlet/platform/switch_x32_unix.h
220+++ b/src/greenlet/platform/switch_x32_unix.h
221@@ -22,8 +22,8 @@ slp_switch(void)
222 void* ebx;
223 unsigned int csr;
224 unsigned short cw;
225- register int err;
226- register int *stackref, stsizediff;
227+ int err;
228+ int *stackref, stsizediff;
229 __asm__ volatile ("" : : : REGS_TO_SAVE);
230 __asm__ volatile ("fstcw %0" : "=m" (cw));
231 __asm__ volatile ("stmxcsr %0" : "=m" (csr));
232diff --git a/src/greenlet/platform/switch_x86_unix.h b/src/greenlet/platform/switch_x86_unix.h
233index 3a95186..493fa6b 100644
234--- a/src/greenlet/platform/switch_x86_unix.h
235+++ b/src/greenlet/platform/switch_x86_unix.h
236@@ -51,7 +51,7 @@ slp_switch(void)
237 #endif
238 void *ebp, *ebx;
239 unsigned short cw;
240- register int *stackref, stsizediff;
241+ int *stackref, stsizediff;
242 __asm__ volatile ("" : : : "esi", "edi");
243 __asm__ volatile ("fstcw %0" : "=m" (cw));
244 __asm__ volatile ("movl %%ebp, %0" : "=m" (ebp));
245--
2462.39.1
247
diff --git a/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch b/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch
deleted file mode 100644
index 5abe59279f..0000000000
--- a/meta-python/recipes-devtools/python/python3-greenlet/0001-greenlet-Drop-using-register-storage-class-keyword.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From aa505359a3bb5a954fe3c7fbd853c75802bf3533 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 16 Jan 2023 21:37:26 -0800
4Subject: [PATCH] greenlet: Drop using 'register' storage class keyword
5
6This has been dropped in c++17 and newer
7
8Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/336]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/greenlet/platform/switch_riscv_unix.h | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/src/greenlet/platform/switch_riscv_unix.h b/src/greenlet/platform/switch_riscv_unix.h
15index 5b5ea98..24df9db 100644
16--- a/src/greenlet/platform/switch_riscv_unix.h
17+++ b/src/greenlet/platform/switch_riscv_unix.h
18@@ -11,8 +11,8 @@
19 static int
20 slp_switch(void)
21 {
22- register int ret;
23- register long *stackref, stsizediff;
24+ int ret;
25+ long *stackref, stsizediff;
26 __asm__ volatile ("" : : : REGS_TO_SAVE);
27 __asm__ volatile ("mv %0, sp" : "=r" (stackref) : );
28 {
29--
302.39.0
31
diff --git a/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb b/meta-python/recipes-devtools/python/python3-greenlet_2.0.2.bb
index 90b5d140d5..a2e036a891 100644
--- a/meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb
+++ b/meta-python/recipes-devtools/python/python3-greenlet_2.0.2.bb
@@ -4,9 +4,7 @@ LICENSE = "MIT & PSF-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ 4LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \
5 file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" 5 file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a"
6 6
7SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch \ 7SRC_URI += "file://0001-cleanup-Drop-using-register-storage-class-keyword-ev.patch"
8 file://0001-PythonAllocator-define-missing-rebind-type.patch" 8SRC_URI[sha256sum] = "e7c8dc13af7db097bed64a051d2dd49e9f0af495c26995c00a9ee842690d34c0"
9
10SRC_URI[sha256sum] = "42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67"
11 9
12inherit pypi setuptools3 10inherit pypi setuptools3
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-31 23:04:59 +0000