summaryrefslogtreecommitdiffstats
path: root/package/nodejs
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2016-12-01 22:22:06 +0100
committerPeter Korsgaard <peter@korsgaard.com>2016-12-01 22:29:56 +0100
commit8852f08eeda3c9ff4c5f9cc90a169338bda1bff9 (patch)
tree8b22aaa4e3c283a73fe2af2eccdfa3926a5430ef /package/nodejs
parent42dd856ca930f79a831361e337d25fb8dd6e0dd1 (diff)
parent4f29cc436b24a8007b065253babe27b9346a479e (diff)
downloadbuildroot-8852f08eeda3c9ff4c5f9cc90a169338bda1bff9.tar.gz
buildroot-8852f08eeda3c9ff4c5f9cc90a169338bda1bff9.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nodejs')
-rw-r--r--package/nodejs/6.9.1/0001-gyp-force-link-command-to-use-CXX.patch (renamed from package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch)0
-rw-r--r--package/nodejs/6.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch (renamed from package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch)0
-rw-r--r--package/nodejs/Config.in2
-rw-r--r--package/nodejs/nodejs.hash4
4 files changed, 3 insertions, 3 deletions
diff --git a/package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/6.9.1/0001-gyp-force-link-command-to-use-CXX.patch
index 5746582c14..5746582c14 100644
--- a/package/nodejs/6.7.0/0001-gyp-force-link-command-to-use-CXX.patch
+++ b/package/nodejs/6.9.1/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.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
index c07cbf8c65..c07cbf8c65 100644
--- a/package/nodejs/6.7.0/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
+++ b/package/nodejs/6.9.1/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 976be50e4d..a47ba37a4a 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.7.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+ default "6.9.1" 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 f334a47e98..5df79afee4 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.7.0/SHASUMS256.txt
-sha256 ceb028324aab1ee8c7ea6a62026f036f3ea71f5ef5212593d0f833f999dd3be5 node-v6.7.0.tar.xz
+# From upstream URL: http://nodejs.org/dist/v6.9.1/SHASUMS256.txt
+sha256 0bdd8d1305777cc8cd206129ea494d6c6ce56001868dd80147aff531d6df0729 node-v6.9.1.tar.xz
OpenPOWER on IntegriCloud