2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-07-04 15:02:27 +00:00

nodejs: fix python-3.10. Closes #350

This commit is contained in:
Dylan Araps 2021-10-06 07:25:02 +03:00
parent 60aca989dd
commit fc258769a9
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
4 changed files with 51 additions and 0 deletions

View File

@ -1,5 +1,7 @@
#!/bin/sh -e
patch -p1 < python-3.10.patch
# Fix build when libatomic.so does not exist in the system.
# This may be provided by compiler-rt which requires no additional
# linker flags to be used.

View File

@ -1 +1,2 @@
97dc1aca232b4911e0b9e5a23a03200ab8ef05157e03c732315b579481bf7912
4a9acf25dd64f94ad551f8a0e8c81189c23912132705f1655f7f9c54073d55b3

View File

@ -0,0 +1,47 @@
diff --git a/configure b/configure
index baf4b513..6ef2da2e 100755
--- a/configure
+++ b/configure
@@ -4,6 +4,7 @@
# Note that the mix of single and double quotes is intentional,
# as is the fact that the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
+command -v python3.10 >/dev/null && exec python3.10 "$0" "$@"
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
@@ -21,7 +22,7 @@ except ImportError:
from distutils.spawn import find_executable as which
print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info))
-acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6))
+acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6))
if sys.version_info[:2] in acceptable_pythons:
import configure
else:
diff --git a/deps/v8/third_party/jinja2/tests.py b/deps/v8/third_party/jinja2/tests.py
index 0adc3d4d..b14f85ff 100644
--- a/deps/v8/third_party/jinja2/tests.py
+++ b/deps/v8/third_party/jinja2/tests.py
@@ -10,7 +10,7 @@
"""
import operator
import re
-from collections import Mapping
+from collections.abc import Mapping
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal
diff --git a/tools/inspector_protocol/jinja2/tests.py b/tools/inspector_protocol/jinja2/tests.py
index 0adc3d4d..b14f85ff 100644
--- a/tools/inspector_protocol/jinja2/tests.py
+++ b/tools/inspector_protocol/jinja2/tests.py
@@ -10,7 +10,7 @@
"""
import operator
import re
-from collections import Mapping
+from collections.abc import Mapping
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal

View File

@ -1 +1,2 @@
https://nodejs.org/download/release/vVERSION/node-vVERSION.tar.xz
patches/python-3.10.patch