Skip to contentSkip to conversation

python3-gevent: Upgrade to 22.8.0

PATCH New Khem Raj 1 participant 1 message Oct 12, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 python3-gevent: Upgrade to 22.8.0

This has the python 3.11 fix in it so drop the patch
Add a patch to avoid adding native include paths to compiler cmdline

Cc Alexander Kanavin <[email protected]>

---
v2: Fix native path inclusion issue

 ...setuputils.py-Do-not-add-sys_inc_dir.patch |  40 +++++
 .../python/python3-gevent/py-3.11.patch       | 170 ------------------
 ...nt_21.12.0.bb => python3-gevent_22.8.0.bb} |   6 +-
 3 files changed, 43 insertions(+), 173 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-gevent/0001-_setuputils.py-Do-not-add-sys_inc_dir.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-gevent/py-3.11.patch
 rename meta-python/recipes-devtools/python/{python3-gevent_21.12.0.bb => python3-gevent_22.8.0.bb} (87%)
meta-python/recipes-devtools/python/python3-gevent/0001-_setuputils.py-Do-not-add-sys_inc_dir.patch new file +40 -0
new file mode 100644
index 0000000000..ac8b031cf5
@@ -0,0 +1,40 @@
+From f3267ad7994a4b66e6bcf72cb0e418105f77bd52 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 11 Oct 2022 17:37:01 -0700
+Subject: [PATCH] _setuputils.py: Do not add sys_inc_dir
+
+sys_inc_dir computes to ignore sysroot and ends with paths into host
+system include area, which is then flagged by OE gcc since it finds
+the host include path poisoning. Since we are adding the syroot anyway
+we really do not need setuptools to deduce it for us.
+
+Upstream-Status: Inappropriate [ Cross-compile specific ]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ _setuputils.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/_setuputils.py b/_setuputils.py
+index d98f716..31134a4 100644
+--- a/_setuputils.py
++++ b/_setuputils.py
+@@ -161,7 +161,6 @@ def get_include_dirs(*extra_paths):
+     # Neither sysconfig dir is not enough if we're in a virtualenv; the greenlet.h
+     # header goes into a site/ subdir. See https://github.com/pypa/pip/issues/4610
+     dist_inc_dir = os.path.abspath(dist_sysconfig.get_python_inc()) # 1
+-    sys_inc_dir = os.path.abspath(sysconfig.get_path("include")) # 2
+     venv_include_dir = os.path.join(
+         sys.prefix, 'include', 'site',
+         'python' + sysconfig.get_python_version()
+@@ -175,7 +174,7 @@ def get_include_dirs(*extra_paths):
+ 
+     return [
+         p
+-        for p in (dist_inc_dir, sys_inc_dir, dep_inc_dir) + extra_paths
++        for p in (dist_inc_dir, dep_inc_dir) + extra_paths
+         if os.path.exists(p)
+     ]
+ 
+-- 
+2.38.0
+
meta-python/recipes-devtools/python/python3-gevent/py-3.11.patch deleted +0 -170

170 lines not on this page · raw message

meta-python/recipes-devtools/python/python3-gevent_22.8.0.bb renamed from meta-python/recipes-devtools/python/python3-gevent_21.12.0.bb +3 -3
similarity index 87%
rename from meta-python/recipes-devtools/python/python3-gevent_21.12.0.bb
rename to meta-python/recipes-devtools/python/python3-gevent_22.8.0.bb
index f891c2eeab..96a0cb78e2 100644
@@ -11,7 +11,9 @@ RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \
 		  ${PYTHON_PN}-pprint \
 		 "
 
-SRC_URI[sha256sum] = "f48b64578c367b91fa793bf8eaaaf4995cb93c8bc45860e473bf868070ad094e"
+SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch"
+
+SRC_URI[sha256sum] = "868d500fe2b7f9750eadc07ada8ab32360c0e71976be2bf5919482f14a6477c7"
 
 inherit pypi setuptools3
 
@@ -31,5 +33,3 @@ do_configure:append() {
 do_compile:append() {
         sed -i -e 's#${WORKDIR}##g' ${S}/src/gevent/*.c ${S}/src/gevent/libev/*.c ${S}/src/gevent/resolver/*.c
 }
-
-SRC_URI += "file://py-3.11.patch"
Signature · 1 line
2.38.0