summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-20 12:35:44 +0000
committerSam James <sam@gentoo.org>2022-01-20 12:35:44 +0000
commit11dbcf457bf4b7ec83c26e1d4eb3d7b9366b7e13 (patch)
treed52d65f690fe5b5cc6c11fb2e6feea31cbd21227
parentwww-servers/uwsgi: fix python 3.10 (upstream patches) (diff)
downloadgentoo-11dbcf45.tar.gz
gentoo-11dbcf45.tar.bz2
gentoo-11dbcf45.zip
www-servers/uwsgi: add additional Python 3.10 patch
Bug: https://bugs.gentoo.org/829204 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch23
-rw-r--r--www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild1
2 files changed, 24 insertions, 0 deletions
diff --git a/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch
new file mode 100644
index 000000000000..d175a99c65fb
--- /dev/null
+++ b/www-servers/uwsgi/files/uwsgi-2.0.19.1-py310-fix-2.patch
@@ -0,0 +1,23 @@
+https://github.com/unbit/uwsgi/commit/94b28b156c26d5b0b4ba93fedb057e9aebf59545.patch
+
+From 94b28b156c26d5b0b4ba93fedb057e9aebf59545 Mon Sep 17 00:00:00 2001
+From: Thea Flowers <me@thea.codes>
+Date: Tue, 2 Nov 2021 16:29:36 -0400
+Subject: [PATCH] Add PY_SSIZE_T_CLEAN define for Python 3.10 support
+
+---
+ plugins/python/uwsgi_python.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
+index aca1f83b7..ec64ad80c 100644
+--- a/plugins/python/uwsgi_python.h
++++ b/plugins/python/uwsgi_python.h
+@@ -1,4 +1,6 @@
+ #include <uwsgi.h>
++/* See https://docs.python.org/3.10/whatsnew/3.10.html#id2 */
++#define PY_SSIZE_T_CLEAN
+ #include <Python.h>
+
+ #include <frameobject.h>
+
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild
index c547c3316a71..089c51e499e2 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1-r108.ebuild
@@ -131,6 +131,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-py310-fix.patch"
"${FILESDIR}/${P}-pynode-compile.patch"
+ "${FILESDIR}/${P}-py310-fix-2.patch"
)
S="${WORKDIR}/${MY_P}"