mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-05 14:09:53 +03:00
9d3b69dfdd
Patch #4 was applied upstream, however a new bug was introduced which breaks building nodejs without OpenSSL support. We replace the applied patch with a new patch to fix: error: ‘ALLOW_INSECURE_SERVER_DHPARAM’ was not declared in this scope ALLOW_INSECURE_SERVER_DHPARAM = true; Patch #4 status: Sent upstream [1] [1] https://github.com/nodejs/node/pull/4201 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
64 lines
2.1 KiB
Diff
64 lines
2.1 KiB
Diff
From 4a48c65921b0f05b621aef5b902b6aa54811ad7a Mon Sep 17 00:00:00 2001
|
|
From: Martin Bark <martin@barkynet.com>
|
|
Date: Tue, 30 Jun 2015 09:44:33 +0100
|
|
Subject: [PATCH 3/4] Use a python variable instead of hardcoding Python
|
|
|
|
The nodejs build system uses python in a number of locations. However,
|
|
there are some locations where it hardcodes 'python' as the Python
|
|
interpreter. However, this causes problems when we need to use python2
|
|
instead of just python.
|
|
|
|
This patch fixes that by using the python variable already in place in
|
|
the nodejs build system.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
[Martin: adapt to 0.12.5]
|
|
Signed-off-by: Martin Bark <martin@barkynet.com>
|
|
---
|
|
deps/v8/tools/gyp/v8.gyp | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp
|
|
index c703155..06c0b2b 100644
|
|
--- a/deps/v8/tools/gyp/v8.gyp
|
|
+++ b/deps/v8/tools/gyp/v8.gyp
|
|
@@ -1353,7 +1353,7 @@
|
|
'outputs': [
|
|
'<(PRODUCT_DIR)/natives_blob.bin',
|
|
],
|
|
- 'action': ['python', '<@(_inputs)', '<@(_outputs)'],
|
|
+ 'action': ['<(python)', '<@(_inputs)', '<@(_outputs)'],
|
|
}],
|
|
}],
|
|
['want_separate_host_toolset==1', {
|
|
@@ -1435,7 +1435,7 @@
|
|
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
|
|
],
|
|
'action': [
|
|
- 'python',
|
|
+ '<(python)',
|
|
'../../tools/js2c.py',
|
|
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
|
|
'CORE',
|
|
@@ -1462,7 +1462,7 @@
|
|
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
|
|
],
|
|
'action': [
|
|
- 'python',
|
|
+ '<(python)',
|
|
'../../tools/js2c.py',
|
|
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
|
|
'EXPERIMENTAL',
|
|
@@ -1500,7 +1500,7 @@
|
|
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
|
|
],
|
|
'action': [
|
|
- 'python',
|
|
+ '<(python)',
|
|
'../../tools/gen-postmortem-metadata.py',
|
|
'<@(_outputs)',
|
|
'<@(heapobject_files)'
|
|
--
|
|
2.1.4
|
|
|