Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Bark <martin@barkynet.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/nodejs: bump version to 6.7.0
Date: Thu, 29 Sep 2016 20:12:46 +0100	[thread overview]
Message-ID: <1475176366-30034-2-git-send-email-martin@barkynet.com> (raw)
In-Reply-To: <1475176366-30034-1-git-send-email-martin@barkynet.com>

https://nodejs.org/en/blog/release/v6.7.0/

The patches from 6.2.1 have been copied to 6.7.0 with the following
changes:

- Add 0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
  to disable the new V8 inspector when openssl is not included.

Signed-off-by: Martin Bark <martin@barkynet.com>
---
 .../0001-gyp-force-link-command-to-use-CXX.patch   |  0
 ...-don-t-build-when-ssl-support-is-disabled.patch | 35 ++++++++++++++++++++++
 package/nodejs/Config.in                           |  2 +-
 package/nodejs/nodejs.hash                         |  4 +--
 4 files changed, 38 insertions(+), 3 deletions(-)
 rename package/nodejs/{6.2.1 => 6.7.0}/0001-gyp-force-link-command-to-use-CXX.patch (100%)
 create mode 100644 package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch

diff --git a/package/nodejs/6.2.1/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch
similarity index 100%
rename from package/nodejs/6.2.1/0001-gyp-force-link-command-to-use-CXX.patch
rename to package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch
diff --git a/package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
new file mode 100644
index 0000000..c07cbf8
--- /dev/null
+++ b/package/nodejs/6.7.0/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 b591b59..976be50 100644
--- 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.2.1"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+	default "6.7.0"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 	default "0.10.47"
 
 config BR2_PACKAGE_NODEJS_NPM
diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash
index 97f2755..f334a47 100644
--- a/package/nodejs/nodejs.hash
+++ b/package/nodejs/nodejs.hash
@@ -1,5 +1,5 @@
 # From upstream URL: http://nodejs.org/dist/v0.10.47/SHASUMS256.txt
 sha256  335bdf4db702885a8acaf2c9f241c70cabd62497361da81aca65c8e8a8e7ff09  node-v0.10.47.tar.xz
 
-# From upstream URL: http://nodejs.org/dist/v6.2.1/SHASUMS256.txt
-sha256  dbaeb8fb68a599e5164b17c74f66d24f424ee4ab3a25d8de8a3c6808e5b42bfb  node-v6.2.1.tar.xz
+# From upstream URL: http://nodejs.org/dist/v6.7.0/SHASUMS256.txt
+sha256  ceb028324aab1ee8c7ea6a62026f036f3ea71f5ef5212593d0f833f999dd3be5  node-v6.7.0.tar.xz
-- 
2.7.4

  reply	other threads:[~2016-09-29 19:12 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-29 19:12 [Buildroot] [PATCH 1/2] package/nodejs: bump version to 0.10.47 Martin Bark
2016-09-29 19:12 ` Martin Bark [this message]
2016-09-30  9:54   ` [Buildroot] [PATCH 2/2] package/nodejs: bump version to 6.7.0 Peter Korsgaard
2016-09-30  9:52 ` [Buildroot] [PATCH 1/2] package/nodejs: bump version to 0.10.47 Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1475176366-30034-2-git-send-email-martin@barkynet.com \
    --to=martin@barkynet.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox