Update Buidlroot 17.02.6 -> 17.02.7
This commit is contained in:
@@ -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
|
||||
@@ -147,7 +147,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) $(LIBS) -Wl,--end-group
|
||||
+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
|
||||
|
||||
# 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,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
|
||||
@@ -4389,8 +4389,10 @@ void Init(int* argc,
|
||||
V8::SetFlagsFromString(NODE_V8_OPTIONS, sizeof(NODE_V8_OPTIONS) - 1);
|
||||
#endif
|
||||
|
||||
+#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
|
||||
|
||||
Reference in New Issue
Block a user