summaryrefslogtreecommitdiffstats
path: root/package/nodejs
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2016-03-02 21:25:00 +0100
committerPeter Korsgaard <peter@korsgaard.com>2016-03-02 21:25:00 +0100
commit28cd1ed30aa4959c744ee37a6070cf22a66fb31f (patch)
treefe08f3fdff6fe458a3a21cf814f12ed6c7ba54e4 /package/nodejs
parent13222c07293becaefc69c46c8f90b04ddc7023d9 (diff)
parent2dfabd10d1e484d84c0e6b5a58ab43d131ca3230 (diff)
downloadbuildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.tar.gz
buildroot-28cd1ed30aa4959c744ee37a6070cf22a66fb31f.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nodejs')
-rw-r--r--package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch (renamed from package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch)0
-rw-r--r--package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch (renamed from package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch)0
-rw-r--r--package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (renamed from package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch)0
-rw-r--r--package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch (renamed from package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch)0
-rw-r--r--package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch (renamed from package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch)0
-rw-r--r--package/nodejs/Config.in2
-rw-r--r--package/nodejs/nodejs.hash4
7 files changed, 3 insertions, 3 deletions
diff --git a/package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch b/package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch
index 65bceef94a..65bceef94a 100644
--- a/package/nodejs/5.5.0/0001-Remove-dependency-on-Python-bz2-module.patch
+++ b/package/nodejs/5.6.0/0001-Remove-dependency-on-Python-bz2-module.patch
diff --git a/package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch
index 5746582c14..5746582c14 100644
--- a/package/nodejs/5.5.0/0002-gyp-force-link-command-to-use-CXX.patch
+++ b/package/nodejs/5.6.0/0002-gyp-force-link-command-to-use-CXX.patch
diff --git a/package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch b/package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
index 4d8d715568..4d8d715568 100644
--- a/package/nodejs/5.5.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
+++ b/package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
diff --git a/package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch b/package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch
index aec8e125a6..aec8e125a6 100644
--- a/package/nodejs/5.5.0/0004-Fix-va_list-not-declared.patch
+++ b/package/nodejs/5.6.0/0004-Fix-va_list-not-declared.patch
diff --git a/package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch b/package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch
index 59b9d5044c..59b9d5044c 100644
--- a/package/nodejs/5.5.0/0005-Fix-support-for-uClibc-ng.patch
+++ b/package/nodejs/5.6.0/0005-Fix-support-for-uClibc-ng.patch
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 7324f6d7f4..7fe5b6f170 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 "5.5.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+ default "5.6.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
default "0.10.42"
menu "Module Selection"
diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash
index a3faa5a455..e205ac39f3 100644
--- a/package/nodejs/nodejs.hash
+++ b/package/nodejs/nodejs.hash
@@ -1,5 +1,5 @@
# From upstream URL: http://nodejs.org/dist/v0.10.42/SHASUMS256.txt
sha256 9b4cc1b5bc397d80dfe217625b04bb6212a3b5a8b1e0eb36000a30d7ae567b8a node-v0.10.42.tar.xz
-# From upstream URL: http://nodejs.org/dist/v5.5.0/SHASUMS256.txt
-sha256 9c46b4dc9548e43826f71f6571f56e39783c456b9516045b496ea73321731e22 node-v5.5.0.tar.xz
+# From upstream URL: http://nodejs.org/dist/v5.6.0/SHASUMS256.txt
+sha256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 node-v5.6.0.tar.xz
OpenPOWER on IntegriCloud