26be36e337
patch is needed for configure script to support python3.9, taken from master, droppable in next release. Closes: #25539 [via git-merge-pr]
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From c8b950a7afcc3e7c222bb94fabccc7e2fb447457 Mon Sep 17 00:00:00 2001
|
|
From: cclauss <cclauss@me.com>
|
|
Date: Tue, 6 Oct 2020 17:51:24 +0200
|
|
Subject: [PATCH] build: gitHub actions: Python 3.9 and actions/setup-python@v2
|
|
|
|
PR-URL: https://github.com/nodejs/node/pull/35521
|
|
Reviewed-By: Richard Lau <rlau@redhat.com>
|
|
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
|
|
Reviewed-By: Rich Trott <rtrott@gmail.com>
|
|
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
|
|
Reviewed-By: Myles Borins <myles.borins@gmail.com>
|
|
|
|
Modified by fosslinux to remove .github stuff.
|
|
|
|
diff --git configure configure
|
|
index 7e8c4cff832..07581d9c5a4 100755
|
|
--- configure
|
|
+++ configure
|
|
@@ -5,6 +5,7 @@
|
|
# as is the fact that the ] goes on a new line.
|
|
_=[ 'exec' '/bin/sh' '-c' '''
|
|
test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient
|
|
+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" "$@"
|
|
command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
|
|
@@ -19,7 +20,7 @@ import sys
|
|
from distutils.spawn import find_executable
|
|
|
|
print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
|
|
-acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
|
|
+acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
|
|
if sys.version_info[:2] in acceptable_pythons:
|
|
import configure
|
|
else:
|