From 6b796c29c53154e92d301695d2e94c3f9c30dd4b Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Mon, 24 Oct 2022 18:04:10 -0500 Subject: [PATCH] nodejs: python 3.11 compatibility --- extra/nodejs/build | 2 ++ extra/nodejs/patches/python-3.11.patch | 21 +++++++++++++++++++++ extra/nodejs/sources | 1 + 3 files changed, 24 insertions(+) create mode 100644 extra/nodejs/patches/python-3.11.patch diff --git a/extra/nodejs/build b/extra/nodejs/build index dc13b6bb..fa780701 100755 --- a/extra/nodejs/build +++ b/extra/nodejs/build @@ -1,5 +1,7 @@ #!/bin/sh -e +patch -p1 < python-3.11.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. diff --git a/extra/nodejs/patches/python-3.11.patch b/extra/nodejs/patches/python-3.11.patch new file mode 100644 index 00000000..3cb41769 --- /dev/null +++ b/extra/nodejs/patches/python-3.11.patch @@ -0,0 +1,21 @@ +diff --git a/configure b/configure +index 6ef2da2..fefb313 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.11 >/dev/null && exec python3.11 "$0" "$@" + 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" "$@" +@@ -22,7 +23,7 @@ except ImportError: + from distutils.spawn import find_executable as which + + print('Node.js configure: Found Python {}.{}.{}...'.format(*sys.version_info)) +-acceptable_pythons = ((3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) ++acceptable_pythons = ((3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6)) + if sys.version_info[:2] in acceptable_pythons: + import configure + else: diff --git a/extra/nodejs/sources b/extra/nodejs/sources index b812f1d0..14d42529 100644 --- a/extra/nodejs/sources +++ b/extra/nodejs/sources @@ -1 +1,2 @@ https://nodejs.org/download/release/vVERSION/node-vVERSION.tar.xz +patches/python-3.11.patch