summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch36
-rw-r--r--meta-python/recipes-devtools/gyp/gyp_git.bb3
2 files changed, 1 insertions, 38 deletions
diff --git a/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch b/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch
deleted file mode 100644
index d1ac2c6b42..0000000000
--- a/meta-python/recipes-devtools/gyp/gyp/0001-Fix-for-Python-3.10-compatibility.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From bfe579283e5fcab60172818bfe4e6e1d40c2bed0 Mon Sep 17 00:00:00 2001
2From: Kurt Kiefer <kurt.kiefer@arthrex.com>
3Date: Mon, 18 Oct 2021 11:21:14 -0700
4Subject: [PATCH] Fix for Python 3.10 compatibility
5
6The collections.abc module replaces collections for Python 3.10
7
8Signed-off-by: Kurt Kiefer <kurt.kiefer@arthrex.com>
9---
10Upstream-Status: Pending
11
12 pylib/gyp/common.py | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/pylib/gyp/common.py b/pylib/gyp/common.py
16index b268d229..4f9cb0ec 100644
17--- a/pylib/gyp/common.py
18+++ b/pylib/gyp/common.py
19@@ -4,7 +4,7 @@
20
21 from __future__ import with_statement
22
23-import collections
24+import collections.abc
25 import errno
26 import filecmp
27 import os.path
28@@ -494,7 +494,7 @@ def uniquer(seq, idfun=None):
29
30
31 # Based on http://code.activestate.com/recipes/576694/.
32-class OrderedSet(collections.MutableSet):
33+class OrderedSet(collections.abc.MutableSet):
34 def __init__(self, iterable=None):
35 self.end = end = []
36 end += [None, end, end] # sentinel node for doubly linked list
diff --git a/meta-python/recipes-devtools/gyp/gyp_git.bb b/meta-python/recipes-devtools/gyp/gyp_git.bb
index 38906de759..0f94a4476d 100644
--- a/meta-python/recipes-devtools/gyp/gyp_git.bb
+++ b/meta-python/recipes-devtools/gyp/gyp_git.bb
@@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab828cb8ce4c62ee82945a11247b6bbd"
5SECTION = "devel" 5SECTION = "devel"
6 6
7SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https;branch=master \ 7SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https;branch=master \
8 file://0001-Fix-for-Python-3.10-compatibility.patch \
9 " 8 "
10SRCREV = "caa60026e223fc501e8b337fd5086ece4028b1c6" 9SRCREV = "a03d7413becefc8d55c8aa3df58b55b9bd0e9052"
11 10
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
13PV = "0.1+git${SRCPV}" 12PV = "0.1+git${SRCPV}"