Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
From 3d4817c152d6f3afddcc699949c4d1664da91e2b Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Tue, 30 Jun 2015 09:43:11 +0100
|
||||
Subject: [PATCH 1/4] Remove dependency on Python bz2 module
|
||||
|
||||
Do not import the bz2 module, it is not used.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
[Martin: adapt to 0.12.5]
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
[yann.morin.1998@free.fr: adapt to 4.1.2]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
deps/v8/tools/js2c.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/deps/v8/tools/js2c.py b/deps/v8/tools/js2c.py
|
||||
index 77485f6..371caf5 100755
|
||||
--- a/deps/v8/tools/js2c.py
|
||||
+++ b/deps/v8/tools/js2c.py
|
||||
@@ -34,7 +34,6 @@
|
||||
import os, re, sys, string
|
||||
import optparse
|
||||
import jsmin
|
||||
-import bz2
|
||||
import textwrap
|
||||
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 90a3c113c19ec615249ab880c45c6c0a8d369098 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Tue, 30 Jun 2015 09:43:47 +0100
|
||||
Subject: [PATCH 2/4] gyp: force link command to use CXX
|
||||
|
||||
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
[yann.morin.1998@free.fr: adapt to 4.1.2]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
tools/gyp/pylib/gyp/generator/make.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
|
||||
index b88a433..0a1f2e0 100644
|
||||
--- a/tools/gyp/pylib/gyp/generator/make.py
|
||||
+++ b/tools/gyp/pylib/gyp/generator/make.py
|
||||
@@ -142,7 +142,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
|
||||
# special "figure out circular dependencies" flags around the entire
|
||||
# input list during linking.
|
||||
quiet_cmd_link = LINK($(TOOLSET)) $@
|
||||
-cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
|
||||
+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
|
||||
|
||||
# We support two kinds of shared objects (.so):
|
||||
# 1) shared_library, which is just bundling together many dependent libraries
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
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>
|
||||
[yann.morin.1998@free.fr: adapt to 4.1.2]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
[Martin: adapt to 5.5.0]
|
||||
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 1e5705d..e2e5dfe 100644
|
||||
--- a/deps/v8/tools/gyp/v8.gyp
|
||||
+++ b/deps/v8/tools/gyp/v8.gyp
|
||||
@@ -1723,14 +1723,14 @@
|
||||
'<(PRODUCT_DIR)/natives_blob_host.bin',
|
||||
],
|
||||
'action': [
|
||||
- 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
|
||||
+ '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
|
||||
],
|
||||
}, {
|
||||
'outputs': [
|
||||
'<(PRODUCT_DIR)/natives_blob.bin',
|
||||
],
|
||||
'action': [
|
||||
- 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
|
||||
+ '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
|
||||
],
|
||||
}],
|
||||
],
|
||||
@@ -1739,7 +1739,7 @@
|
||||
'<(PRODUCT_DIR)/natives_blob.bin',
|
||||
],
|
||||
'action': [
|
||||
- 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
|
||||
+ '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
|
||||
],
|
||||
}],
|
||||
],
|
||||
@@ -1847,7 +1847,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
|
||||
],
|
||||
'action': [
|
||||
- 'python',
|
||||
+ '<(python)',
|
||||
'../../tools/js2c.py',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
|
||||
'CORE',
|
||||
@@ -1873,7 +1873,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
|
||||
],
|
||||
'action': [
|
||||
- 'python',
|
||||
+ '<(python)',
|
||||
'../../tools/js2c.py',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
|
||||
'EXPERIMENTAL',
|
||||
@@ -1898,7 +1898,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
|
||||
],
|
||||
'action': [
|
||||
- 'python',
|
||||
+ '<(python)',
|
||||
'../../tools/js2c.py',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
|
||||
'CODE_STUB',
|
||||
@@ -1923,7 +1923,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
|
||||
],
|
||||
'action': [
|
||||
- 'python',
|
||||
+ '<(python)',
|
||||
'../../tools/js2c.py',
|
||||
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
|
||||
'EXTRAS',
|
||||
@@ -1960,7 +1960,7 @@
|
||||
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
|
||||
],
|
||||
'action': [
|
||||
- 'python',
|
||||
+ '<(python)',
|
||||
'../../tools/gen-postmortem-metadata.py',
|
||||
'<@(_outputs)',
|
||||
'<@(heapobject_files)'
|
||||
diff --git a/deps/v8/build/toolchain.gypi b/deps/v8/build/toolchain.gypi
|
||||
index c703155..06c0b2b 100644
|
||||
--- a/deps/v8/build/toolchain.gypi
|
||||
+++ b/deps/v8/build/toolchain.gypi
|
||||
@@ -38,7 +38,7 @@
|
||||
'ubsan%': 0,
|
||||
'ubsan_vptr%': 0,
|
||||
'v8_target_arch%': '<(target_arch)',
|
||||
- 'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
|
||||
+ 'v8_host_byteorder%': '<!(<(python) -c "import sys; print sys.byteorder")',
|
||||
# Native Client builds currently use the V8 ARM JIT and
|
||||
# arm/simulator-arm.cc to defer the significant effort required
|
||||
# for NaCl JIT support. The nacl_target_arch variable provides
|
||||
@@ -0,0 +1,39 @@
|
||||
From 5b3dd2599ebde1846750aaf7c79576ad45246ffa Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Tue, 8 Dec 2015 11:41:08 +0000
|
||||
Subject: [PATCH] Fix va_list not declared
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When compiling with uClibc-ng the following error is seen.
|
||||
|
||||
In file included from ../deps/v8/src/log-utils.cc:5:0:
|
||||
../deps/v8/src/log-utils.h:64:39: error: ‘va_list’ has not been declared
|
||||
void AppendVA(const char* format, va_list args);
|
||||
|
||||
This patch fixes the issue by adding the missing #include <cstdarg>. Note
|
||||
that this fix has already be included upstream, see
|
||||
https://github.com/nodejs/node/blob/8a43a3d/deps/v8/src/log-utils.h
|
||||
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
---
|
||||
deps/v8/src/log-utils.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/deps/v8/src/log-utils.h b/deps/v8/src/log-utils.h
|
||||
index 87dab52..6714307 100644
|
||||
--- a/deps/v8/src/log-utils.h
|
||||
+++ b/deps/v8/src/log-utils.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef V8_LOG_UTILS_H_
|
||||
#define V8_LOG_UTILS_H_
|
||||
|
||||
+#include <cstdarg>
|
||||
+
|
||||
#include "src/allocation.h"
|
||||
#include "src/base/platform/mutex.h"
|
||||
#include "src/flags.h"
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 1cc08f6ceacbb0e5ba1f4638ca3a97ac002d7792 Mon Sep 17 00:00:00 2001
|
||||
From: "Bark, Martin" <martin.bark@te.com>
|
||||
Date: Mon, 14 Dec 2015 13:26:10 +0000
|
||||
Subject: [PATCH 2/2] Fix support for uClibc-ng
|
||||
|
||||
uClibc-ng is currently at v1.0.9. The patch corrects the uClibc
|
||||
version test so that HAVE_IFADDRS_H is defined for uClibc versions
|
||||
after v0.9.32.
|
||||
|
||||
Submitted upstream to libuv and accepted, see
|
||||
https://github.com/libuv/libuv/pull/653 and
|
||||
https://github.com/libuv/libuv/commit/c861972
|
||||
|
||||
Signed-off-by: Bark, Martin <martin.bark@te.com>
|
||||
---
|
||||
deps/uv/src/unix/linux-core.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c
|
||||
index e6e6828..6cbbb71 100644
|
||||
--- a/deps/uv/src/unix/linux-core.c
|
||||
+++ b/deps/uv/src/unix/linux-core.c
|
||||
@@ -39,7 +39,7 @@
|
||||
#define HAVE_IFADDRS_H 1
|
||||
|
||||
#ifdef __UCLIBC__
|
||||
-# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32
|
||||
+# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32
|
||||
# undef HAVE_IFADDRS_H
|
||||
# endif
|
||||
#endif
|
||||
--
|
||||
2.6.2
|
||||
Reference in New Issue
Block a user