rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Buildroot from 17.02.4 -> 17.02.5

Browse Source
This commit is contained in:
jbnadal
2018-01-04 17:43:08 +01:00
parent 2c7985bce0
commit ffe52f2bd0
123 changed files with 1695 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bsp/buildroot/package/nodejs/6.11.1/0001-gyp-force-link-command-to-use-CXX.patch Normal file
View File

@@ -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

35
bsp/buildroot/package/nodejs/6.11.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch Normal file
View File

@@ -0,0 +1,35 @@
From 7fa541f6c0a31e3ddcab6ea85040b531bbaa4651 Mon Sep 17 00:00:00 2001
From: Martin Bark <martin@barkynet.com>
Date: Tue, 12 Jul 2016 19:03:28 +0100
Subject: [PATCH] inspector: don't build when ssl support is disabled
Signed-off-by: Martin Bark <martin@barkynet.com>
---
node.gyp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/node.gyp b/node.gyp
index 8a8bd00..fdccd60 100644
--- a/node.gyp
+++ b/node.gyp
@@ -302,7 +302,7 @@
'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune'
],
}],
- [ 'v8_inspector=="true"', {
+ [ 'v8_inspector=="true" and node_use_openssl =="true"', {
'defines': [
'HAVE_INSPECTOR=1',
'V8_INSPECTOR_USE_STL=1',
@@ -828,7 +828,7 @@
],
'conditions': [
- ['v8_inspector=="true"', {
+ ['v8_inspector=="true" and node_use_openssl =="true"', {
'sources': [
'src/inspector_socket.cc',
'test/cctest/test_inspector_socket.cc'
--
2.7.4

49
bsp/buildroot/package/nodejs/6.11.1/0003-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch Normal file
View File

@@ -0,0 +1,49 @@
From e1d8899c28997613505d288d22bfb95470d606a1 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Tue, 28 Feb 2017 20:04:12 +0100
Subject: [PATCH] src: add HAVE_OPENSSL directive to openssl_config
Currently when building with the following configuration options:
$ ./configure --without-ssl && make
The following link error is reported:
Undefined symbols for architecture x86_64:
"node::openssl_config", referenced from:
node::Init(int*, char const**, int*, char const***) in node.o
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see
invocation)
Adding an HAVE_OPENSSL directive around this code allows the build to
pass.
PR-URL: https://github.com/nodejs/node/pull/11618
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
src/node.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/node.cc b/src/node.cc
index 57415bba41..ec78339d89 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -4233,8 +4233,10 @@ void Init(int* argc,
if (config_warning_file.empty())
SafeGetenv("NODE_REDIRECT_WARNINGS", &config_warning_file);
+#if HAVE_OPENSSL
if (openssl_config.empty())
SafeGetenv("OPENSSL_CONF", &openssl_config);
+#endif
// Parse a few arguments which are specific to Node.
int v8_argc;
--
2.11.0