diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-13 07:40:24 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-13 07:54:57 +0200 |
| commit | 5c04b94abacde55c7f4877fda4dc07115db601da (patch) | |
| tree | 6f3d65b61f3a39ce85961c4755deec0f753131b8 /patches | |
| parent | 20817a2b29f5589399f6e47287c03b8155f6cc80 (diff) | |
| download | ptxdist-5c04b94abacde55c7f4877fda4dc07115db601da.tar.gz ptxdist-5c04b94abacde55c7f4877fda4dc07115db601da.tar.xz | |
nodejs: use the correct python version
Add the necessary dependency and make sure the correct version is used.
Note: The latest versions support Python 3 and there seem to be plans for
backports to 12.x but no PRs so far.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/node-v12.16.1/0005-HACK-run-configure-directly-with-python2.patch | 23 | ||||
| -rw-r--r-- | patches/node-v12.16.1/series | 3 |
2 files changed, 25 insertions, 1 deletions
diff --git a/patches/node-v12.16.1/0005-HACK-run-configure-directly-with-python2.patch b/patches/node-v12.16.1/0005-HACK-run-configure-directly-with-python2.patch new file mode 100644 index 000000000..3119571fc --- /dev/null +++ b/patches/node-v12.16.1/0005-HACK-run-configure-directly-with-python2.patch @@ -0,0 +1,23 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Mon, 13 Apr 2020 07:37:05 +0200 +Subject: [PATCH] HACK: run configure directly with python2 + +This ensures that the correct Python version is used. Without this, +'python2.7' is the first try. This is either the cross Python or bypasses +the host-system-python dependency check. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 9156e13f7aed..317a768b0fd6 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env python2 + + # Locate python2 interpreter and re-execute the script. Note that the + # mix of single and double quotes is intentional, as is the fact that diff --git a/patches/node-v12.16.1/series b/patches/node-v12.16.1/series index 706723222..f0162c556 100644 --- a/patches/node-v12.16.1/series +++ b/patches/node-v12.16.1/series @@ -4,4 +4,5 @@ 0002-Install-both-binaries-and-use-libdir.patch 0003-tools-do-not-explicitely-set-an-rpath-in-make-genera.patch 0004-HACK-don-t-add-LD_LIBRARY_PATH-for-external-tools.patch -# 54ccf86e2c772cc50a5febf46b50b9c9 - git-ptx-patches magic +0005-HACK-run-configure-directly-with-python2.patch +# c39d7fdc79e6b2f672a807f38ade396e - git-ptx-patches magic |