projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46dd08c)
nodejs: bump to version 6.9.4
authorPeter Korsgaard <peter@korsgaard.com>
Sun, 8 Jan 2017 22:42:45 +0000 (23:42 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 9 Jan 2017 10:41:04 +0000 (11:41 +0100)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch [deleted file] patch | blob | history
package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch [deleted file] patch | blob | history
package/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch [new file with mode: 0644] patch | blob
package/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch [new file with mode: 0644] patch | blob
package/nodejs/Config.in patch | blob | history
package/nodejs/nodejs.hash patch | blob | history

diff --git a/package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch
deleted file mode 100644 (file)
index 5746582..0000000
--- a/package/nodejs/6.9.2/0001-gyp-force-link-command-to-use-CXX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
deleted file mode 100644 (file)
index c07cbf8..0000000
--- a/package/nodejs/6.9.2/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
-
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 (file)
index 0000000..5746582
--- /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 (file)
index 0000000..c07cbf8
--- /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
+
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 5c4ee122c6e719365c8b2ca553c6f98f0e8863dc..d2262beb9b3e0c1b00bc8a1a8cfa09e69e99fa0e 100644 (file)
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -43,7 +43,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 
 config BR2_PACKAGE_NODEJS_VERSION_STRING
        string
-       default "6.9.2"         if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+       default "6.9.4"         if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
        default "0.10.48"
 
 config BR2_PACKAGE_NODEJS_NPM
diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash
index 67d0258a647b00b747fc822cfff314f0447fde49..8c8c5a3c231457a9ccd2b81944da404a4b6e55bf 100644 (file)
--- a/package/nodejs/nodejs.hash
+++ b/package/nodejs/nodejs.hash
@@ -1,5 +1,5 @@
 # From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt
 sha256  365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e  node-v0.10.48.tar.xz
 
-# From upstream URL: http://nodejs.org/dist/v6.9.2/SHASUMS256.txt
-sha256  f41b320b37ce23a34dbc597040e71535ea4f6baa2342bc526bb45f5f9aa9c9fb  node-v6.9.2.tar.xz
+# From upstream URL: http://nodejs.org/dist/v6.9.4/SHASUMS256.txt
+sha256  c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35  node-v6.9.4.tar.xz