package/nodejs: bump version to 5.3.0
Replace 4.2.3 with 5.3.0. 5.3.0 is the current Stable release. See https://nodejs.org/en/blog/release/v5.3.0 for details on the release. Copied 4.2.3 patched to 5.3.0 with the following exceptions: - Removed 0004-fix-arm-vfpv2.patch, committed upstream and included in 5.3.0. See https://github.com/nodejs/node/commit/84dea1bd0c - Added 0004-Fix-va_list-not-declared.patch, fix for a new bug. This has already been fixed upstream but is not in 5.3.0 Signed-off-by: Martin Bark <martin@barkynet.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Martin Bark
Thomas Petazzoni
parent
a99b5cdfb3
commit
90bf67c0d2
@ -248,6 +248,15 @@ config BR2_PACKAGE_INFOZIP
|
||||
to avoid ambiguities with Info-Zip's UnZip which has been added
|
||||
in the unzip package.
|
||||
|
||||
config BR2_BR2_PACKAGE_NODEJS_4_X
|
||||
bool "nodejs version 4.x has been removed"
|
||||
select BR2_LEGACY
|
||||
select BR2_PACKAGE_NODEJS
|
||||
help
|
||||
nodejs version 4.x has been removed. As an alternative,
|
||||
the latest nodejs version has been automatically selected in
|
||||
your configuration.
|
||||
|
||||
###############################################################################
|
||||
comment "Legacy options removed in 2015.11"
|
||||
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From 0b07d813adcfdc13ef6a0c56f88b864eb3dc4be9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Tue, 8 Dec 2015 21:53:06 +0100
|
||||
Subject: [PATCH] configure: fix arm vfpv2
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The gcc -mfpu flag for VFPv2 is 'vfp', not 'vfpv2' [1].
|
||||
|
||||
Patch status: Sent upstream [2]
|
||||
|
||||
[1] https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
|
||||
[2] https://github.com/nodejs/node/pull/4202
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
[Jörg Krause: adapt to version 4.2.3]
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
configure | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index d4aff36..c783bab 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -30,7 +30,7 @@ valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
|
||||
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 'x32',
|
||||
'x64', 'x86')
|
||||
valid_arm_float_abi = ('soft', 'softfp', 'hard')
|
||||
-valid_arm_fpu = ('vfp', 'vfpv2', 'vfpv3', 'vfpv3-d16', 'neon')
|
||||
+valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
|
||||
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
|
||||
valid_mips_fpu = ('fp32', 'fp64', 'fpxx')
|
||||
valid_mips_float_abi = ('soft', 'hard')
|
||||
@@ -622,7 +622,7 @@ def configure_arm(o):
|
||||
else:
|
||||
arm_float_abi = 'default'
|
||||
|
||||
- arm_fpu = 'vfpv2'
|
||||
+ arm_fpu = 'vfp'
|
||||
|
||||
if is_arch_armv7():
|
||||
arm_fpu = 'vfpv3'
|
||||
--
|
||||
2.6.3
|
||||
39
package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch
Normal file
39
package/nodejs/5.3.0/0004-Fix-va_list-not-declared.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 5b3dd2599ebde1846750aaf7c79576ad45246ffa Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Tue, 8 Dec 2015 11:41:08 +0000
|
||||
Subject: [PATCH] Fix va_list not declared
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
When compiling with uClibc-ng the following error is seen.
|
||||
|
||||
In file included from ../deps/v8/src/log-utils.cc:5:0:
|
||||
../deps/v8/src/log-utils.h:64:39: error: ‘va_list’ has not been declared
|
||||
void AppendVA(const char* format, va_list args);
|
||||
|
||||
This patch fixes the issue by adding the missing #include <cstdarg>. Note
|
||||
that this fix has already be included upstream, see
|
||||
https://github.com/nodejs/node/blob/8a43a3d/deps/v8/src/log-utils.h
|
||||
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
---
|
||||
deps/v8/src/log-utils.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/deps/v8/src/log-utils.h b/deps/v8/src/log-utils.h
|
||||
index 87dab52..6714307 100644
|
||||
--- a/deps/v8/src/log-utils.h
|
||||
+++ b/deps/v8/src/log-utils.h
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef V8_LOG_UTILS_H_
|
||||
#define V8_LOG_UTILS_H_
|
||||
|
||||
+#include <cstdarg>
|
||||
+
|
||||
#include "src/allocation.h"
|
||||
#include "src/base/platform/mutex.h"
|
||||
#include "src/flags.h"
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@ -37,7 +37,7 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
choice
|
||||
prompt "Node.js version"
|
||||
default BR2_BR2_PACKAGE_NODEJS_0_10_X if BR2_ARM_CPU_ARMV5
|
||||
default BR2_BR2_PACKAGE_NODEJS_4_X
|
||||
default BR2_PACKAGE_NODEJS_5_X
|
||||
help
|
||||
Select the version of Node.js you wish to use.
|
||||
|
||||
@ -48,14 +48,15 @@ config BR2_BR2_PACKAGE_NODEJS_0_12_X
|
||||
bool "v0.12.9"
|
||||
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
|
||||
config BR2_BR2_PACKAGE_NODEJS_4_X
|
||||
bool "v4.2.3"
|
||||
config BR2_PACKAGE_NODEJS_5_X
|
||||
bool "v5.3.0"
|
||||
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_USE_WCHAR
|
||||
|
||||
comment "v4.2.3 needs a toolchain w/ gcc >= 4.8"
|
||||
comment "v5.3.0 needs a toolchain w/ gcc >= 4.8, wchar"
|
||||
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR
|
||||
|
||||
endchoice
|
||||
|
||||
@ -63,7 +64,7 @@ config BR2_PACKAGE_NODEJS_VERSION_STRING
|
||||
string
|
||||
default "0.10.41" if BR2_BR2_PACKAGE_NODEJS_0_10_X
|
||||
default "0.12.9" if BR2_BR2_PACKAGE_NODEJS_0_12_X
|
||||
default "4.2.3" if BR2_BR2_PACKAGE_NODEJS_4_X
|
||||
default "5.3.0" if BR2_PACKAGE_NODEJS_5_X
|
||||
|
||||
menu "Module Selection"
|
||||
|
||||
|
||||
@ -4,5 +4,5 @@ sha256 79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995 node-v0
|
||||
# From upstream URL: http://nodejs.org/dist/v0.12.9/SHASUMS256.txt
|
||||
sha256 35daad301191e5f8dd7e5d2fbb711d081b82d1837d59837b8ee224c256cfe5e4 node-v0.12.9.tar.gz
|
||||
|
||||
# From upstream URL: http://nodejs.org/dist/v4.2.3/SHASUMS256.txt
|
||||
sha256 9e8aef1e47b317575c421c8d10a80e6c319b26969b566d3b84e49e65a92837f4 node-v4.2.3.tar.xz
|
||||
# From upstream URL: http://nodejs.org/dist/v5.3.0/SHASUMS256.txt
|
||||
sha256 e5115ee78c31ac3af0f2b3553aa84fff2f49ae59bd6e01e11d78ce86c544569e node-v5.3.0.tar.xz
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING))
|
||||
ifeq ($(BR2_BR2_PACKAGE_NODEJS_4_X),y)
|
||||
ifeq ($(BR2_PACKAGE_NODEJS_5_X),y)
|
||||
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
|
||||
else
|
||||
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.gz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user