diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-01-08 23:42:45 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-01-09 11:41:04 +0100 |
| commit | 66e13a04ec2021fd1aa96a4f7de8788c066a1ffd (patch) | |
| tree | c0a98c905a4f4016bdf1c73f8d030ff940ed8a18 /package/nodejs/6.9.4 | |
| parent | 46dd08c275720b259f0c214cf72ee27d1855174f (diff) | |
| download | buildroot-66e13a04ec2021fd1aa96a4f7de8788c066a1ffd.tar.gz buildroot-66e13a04ec2021fd1aa96a4f7de8788c066a1ffd.zip | |
nodejs: bump to version 6.9.4
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nodejs/6.9.4')
| -rw-r--r-- | package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch | 29 | ||||
| -rw-r--r-- | package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch | 35 |
2 files changed, 64 insertions, 0 deletions
diff --git a/package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch new file mode 100644 index 0000000000..5746582c14 --- /dev/null +++ b/package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch @@ -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 + diff --git a/package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch new file mode 100644 index 0000000000..c07cbf8c65 --- /dev/null +++ b/package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch @@ -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 + |
