diff options
| author | Martin Bark <martin@barkynet.com> | 2015-06-27 03:01:34 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-06-28 15:14:24 +0200 |
| commit | d00fb884e4415e09b57901b001300c6da43086e2 (patch) | |
| tree | 93f9174e06ea3027a0f1baead3aca2713bbc84f3 /package/nodejs | |
| parent | c0c97a957ab37b7e4ec90075e4f66bc01083ee5c (diff) | |
| download | buildroot-d00fb884e4415e09b57901b001300c6da43086e2.tar.gz buildroot-d00fb884e4415e09b57901b001300c6da43086e2.zip | |
package/nodejs: Update to allow selecting node.js version
[Thomas: fix minor Config.in formatting issues pointed by Yann.]
Signed-off-by: Martin Bark <martin@barkynet.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nodejs')
| -rw-r--r-- | package/nodejs/0.10.39/0001-remove-python-bz2-dependency.patch (renamed from package/nodejs/0001-remove-python-bz2-dependency.patch) | 0 | ||||
| -rw-r--r-- | package/nodejs/0.10.39/0002-gyp-force-link-command-to-use-CXX.patch (renamed from package/nodejs/0002-gyp-force-link-command-to-use-CXX.patch) | 0 | ||||
| -rw-r--r-- | package/nodejs/0.10.39/0003-use-python-variable.patch (renamed from package/nodejs/0003-use-python-variable.patch) | 0 | ||||
| -rw-r--r-- | package/nodejs/0.10.39/0004-fix-build-error-without-OpenSSL-support.patch (renamed from package/nodejs/0004-fix-build-error-without-OpenSSL-support.patch) | 0 | ||||
| -rw-r--r-- | package/nodejs/Config.in | 15 | ||||
| -rw-r--r-- | package/nodejs/nodejs.mk | 2 |
6 files changed, 16 insertions, 1 deletions
diff --git a/package/nodejs/0001-remove-python-bz2-dependency.patch b/package/nodejs/0.10.39/0001-remove-python-bz2-dependency.patch index 75fe437502..75fe437502 100644 --- a/package/nodejs/0001-remove-python-bz2-dependency.patch +++ b/package/nodejs/0.10.39/0001-remove-python-bz2-dependency.patch diff --git a/package/nodejs/0002-gyp-force-link-command-to-use-CXX.patch b/package/nodejs/0.10.39/0002-gyp-force-link-command-to-use-CXX.patch index a2f02abf34..a2f02abf34 100644 --- a/package/nodejs/0002-gyp-force-link-command-to-use-CXX.patch +++ b/package/nodejs/0.10.39/0002-gyp-force-link-command-to-use-CXX.patch diff --git a/package/nodejs/0003-use-python-variable.patch b/package/nodejs/0.10.39/0003-use-python-variable.patch index f231f4c2f2..f231f4c2f2 100644 --- a/package/nodejs/0003-use-python-variable.patch +++ b/package/nodejs/0.10.39/0003-use-python-variable.patch diff --git a/package/nodejs/0004-fix-build-error-without-OpenSSL-support.patch b/package/nodejs/0.10.39/0004-fix-build-error-without-OpenSSL-support.patch index 9d41516292..9d41516292 100644 --- a/package/nodejs/0004-fix-build-error-without-OpenSSL-support.patch +++ b/package/nodejs/0.10.39/0004-fix-build-error-without-OpenSSL-support.patch diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index 31406831c0..9a393854c2 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -22,6 +22,21 @@ comment "nodejs needs a toolchain w/ C++, threads" if BR2_PACKAGE_NODEJS +choice + prompt "Node.js version" + default BR2_BR2_PACKAGE_NODEJS_0_10_39 + help + Select the version of Node.js you wish to use. + +config BR2_BR2_PACKAGE_NODEJS_0_10_39 + bool "v0.10.39" + +endchoice + +config BR2_PACKAGE_NODEJS_VERSION_STRING + string + default "0.10.39" if BR2_BR2_PACKAGE_NODEJS_0_10_39 + menu "Module Selection" config BR2_PACKAGE_NODEJS_NPM diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 4293c70f86..59e03b0095 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 0.10.39 +NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING)) NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs zlib \ |
