summaryrefslogtreecommitdiffstats
path: root/package/nodejs
diff options
context:
space:
mode:
Diffstat (limited to 'package/nodejs')
-rw-r--r--package/nodejs/0.10.42/0001-remove-python-bz2-dependency.patch (renamed from package/nodejs/0.10.41/0001-remove-python-bz2-dependency.patch)0
-rw-r--r--package/nodejs/0.10.42/0002-gyp-force-link-command-to-use-CXX.patch (renamed from package/nodejs/0.10.41/0002-gyp-force-link-command-to-use-CXX.patch)0
-rw-r--r--package/nodejs/0.10.42/0003-use-python-variable.patch (renamed from package/nodejs/0.10.41/0003-use-python-variable.patch)0
-rw-r--r--package/nodejs/0.10.42/0004-fix-musl-USE-MISC-build-issue.patch (renamed from package/nodejs/0.10.41/0004-fix-musl-USE-MISC-build-issue.patch)0
-rw-r--r--package/nodejs/0.10.42/0005-Fix-support-for-uClibc-ng.patch (renamed from package/nodejs/0.10.41/0005-Fix-support-for-uClibc-ng.patch)0
-rw-r--r--package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch25
-rw-r--r--package/nodejs/Config.in2
-rw-r--r--package/nodejs/nodejs.hash4
-rw-r--r--package/nodejs/nodejs.mk4
9 files changed, 21 insertions, 14 deletions
diff --git a/package/nodejs/0.10.41/0001-remove-python-bz2-dependency.patch b/package/nodejs/0.10.42/0001-remove-python-bz2-dependency.patch
index 75fe437502..75fe437502 100644
--- a/package/nodejs/0.10.41/0001-remove-python-bz2-dependency.patch
+++ b/package/nodejs/0.10.42/0001-remove-python-bz2-dependency.patch
diff --git a/package/nodejs/0.10.41/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/0.10.42/0002-gyp-force-link-command-to-use-CXX.patch
index a2f02abf34..a2f02abf34 100644
--- a/package/nodejs/0.10.41/0002-gyp-force-link-command-to-use-CXX.patch
+++ b/package/nodejs/0.10.42/0002-gyp-force-link-command-to-use-CXX.patch
diff --git a/package/nodejs/0.10.41/0003-use-python-variable.patch b/package/nodejs/0.10.42/0003-use-python-variable.patch
index f231f4c2f2..f231f4c2f2 100644
--- a/package/nodejs/0.10.41/0003-use-python-variable.patch
+++ b/package/nodejs/0.10.42/0003-use-python-variable.patch
diff --git a/package/nodejs/0.10.41/0004-fix-musl-USE-MISC-build-issue.patch b/package/nodejs/0.10.42/0004-fix-musl-USE-MISC-build-issue.patch
index 128058df29..128058df29 100644
--- a/package/nodejs/0.10.41/0004-fix-musl-USE-MISC-build-issue.patch
+++ b/package/nodejs/0.10.42/0004-fix-musl-USE-MISC-build-issue.patch
diff --git a/package/nodejs/0.10.41/0005-Fix-support-for-uClibc-ng.patch b/package/nodejs/0.10.42/0005-Fix-support-for-uClibc-ng.patch
index 59b9d5044c..59b9d5044c 100644
--- a/package/nodejs/0.10.41/0005-Fix-support-for-uClibc-ng.patch
+++ b/package/nodejs/0.10.42/0005-Fix-support-for-uClibc-ng.patch
diff --git a/package/nodejs/5.6.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 3104644170..4d8d715568 100644
--- a/package/nodejs/5.6.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
@@ -16,15 +16,17 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.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>
+[Martin: adapt to 5.5.0]
+Signed-off-by: Martin Bark <martin@barkynet.com>
---
deps/v8/tools/gyp/v8.gyp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp
-index c703155..06c0b2b 100644
+index 1e5705d..e2e5dfe 100644
--- a/deps/v8/tools/gyp/v8.gyp
+++ b/deps/v8/tools/gyp/v8.gyp
-@@ -1696,14 +1696,14 @@
+@@ -1723,14 +1723,14 @@
'<(PRODUCT_DIR)/natives_blob_host.bin',
],
'action': [
@@ -41,7 +43,7 @@ index c703155..06c0b2b 100644
],
}],
],
-@@ -1712,7 +1712,7 @@
+@@ -1739,7 +1739,7 @@
'<(PRODUCT_DIR)/natives_blob.bin',
],
'action': [
@@ -50,7 +52,7 @@ index c703155..06c0b2b 100644
],
}],
],
-@@ -1812,7 +1812,7 @@
+@@ -1847,7 +1847,7 @@
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
],
'action': [
@@ -59,7 +61,7 @@ index c703155..06c0b2b 100644
'../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
'CORE',
-@@ -1838,7 +1838,7 @@
+@@ -1873,7 +1873,7 @@
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
],
'action': [
@@ -68,7 +70,16 @@ index c703155..06c0b2b 100644
'../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
'EXPERIMENTAL',
-@@ -1863,7 +1863,7 @@
+@@ -1898,7 +1898,7 @@
+ '<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
+ ],
+ 'action': [
+- 'python',
++ '<(python)',
+ '../../tools/js2c.py',
+ '<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
+ 'CODE_STUB',
+@@ -1923,7 +1923,7 @@
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
],
'action': [
@@ -77,7 +88,7 @@ index c703155..06c0b2b 100644
'../../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'EXTRAS',
-@@ -1900,7 +1900,7 @@
+@@ -1960,7 +1960,7 @@
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
],
'action': [
diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index bec0eee0b8..7fe5b6f170 100644
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -44,7 +44,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
config BR2_PACKAGE_NODEJS_VERSION_STRING
string
default "5.6.0" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
- default "0.10.41"
+ default "0.10.42"
menu "Module Selection"
diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash
index ccad648909..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.41/SHASUMS256.txt
-sha256 79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995 node-v0.10.41.tar.gz
+# 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.6.0/SHASUMS256.txt
sha256 588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3 node-v5.6.0.tar.xz
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 37de331f12..63ae4631fd 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -5,11 +5,7 @@
################################################################################
NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING))
-ifeq ($(findstring 0.10.,$(NODEJS_VERSION)),)
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
-else
-NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz
-endif
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
NODEJS_DEPENDENCIES = host-python host-nodejs zlib \
$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
OpenPOWER on IntegriCloud