package/nodejs: bump version to 4.2.2
PATCH 1/1 package/nodejs: bump version to 4.2.2
v4.2.2 is the current Long Term Support (LTS) version
Moved all v4.1.2 patches to v4.2.2 except 0004-fix-arm-vfpv2.patch as this is no longer needed. Instead use the new --with-arm-fpu configure option. See https://github.com/nodejs/node/issues/2942 and
https://github.com/nodejs/node/pull/3228.
Also, with the introduction of --with-arm-fpu rename NODEJS_ARM_FP to NODEJS_ARM_FLOAT_ABI to make nodejs.mk more readable.
---
package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch | 18 ------------------
.../0001-Remove-dependency-on-Python-bz2-module.patch | 0
.../0002-gyp-force-link-command-to-use-CXX.patch | 0
...-python-variable-instead-of-hardcoding-Python.patch | 0
package/nodejs/Config.in | 6 +++---
package/nodejs/nodejs.hash | 4 ++--
package/nodejs/nodejs.mk | 6 ++++--
7 files changed, 9 insertions(+), 25 deletions(-)
delete mode 100644 package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch
rename package/nodejs/{4.1.2 => 4.2.2}/0001-Remove-dependency-on-Python-bz2-module.patch (100%)
rename package/nodejs/{4.1.2 => 4.2.2}/0002-gyp-force-link-command-to-use-CXX.patch (100%)
rename package/nodejs/{4.1.2 => 4.2.2}/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch (100%)package/nodejs/4.1.2/0004-fix-arm-vfpv2.patch deleted +0 -18
@@ -1,18 +0,0 @@ -configure: fix ARM VFPv2 - -The gcc -mfpu flag for VFPv2 is 'vfp', not 'vfpv2'. - -Signed-off-by: "Yann E. MORIN" <[email protected]> - -diff -durN a/configure b/configure ---- a/configure -+++ b/configure -@@ -611,7 +611,7 @@ - o['variables']['arm_fpu'] = 'vfpv3' - o['variables']['arm_version'] = '7' - else: -- o['variables']['arm_fpu'] = 'vfpv2' -+ o['variables']['arm_fpu'] = 'vfp' - o['variables']['arm_version'] = '6' if is_arch_armv6() else 'default' - - o['variables']['arm_thumb'] = 0 # -marm
package/nodejs/4.2.2/0001-Remove-dependency-on-Python-bz2-module.patch renamed from package/nodejs/4.1.2/0001-Remove-dependency-on-Python-bz2-module.patch +0 -0
package/nodejs/4.2.2/0002-gyp-force-link-command-to-use-CXX.patch renamed from package/nodejs/4.1.2/0002-gyp-force-link-command-to-use-CXX.patch +0 -0
package/nodejs/4.2.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch renamed from package/nodejs/4.1.2/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch +0 -0
package/nodejs/Config.in +3 -3
@@ -49,11 +49,11 @@ config BR2_BR2_PACKAGE_NODEJS_0_12_X depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS config BR2_BR2_PACKAGE_NODEJS_4_X - bool "v4.1.2" + bool "v4.2.2" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 -comment "v4.1.2 needs a toolchain w/ gcc >= 4.8" +comment "v4.2.2 needs a toolchain w/ gcc >= 4.8" depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -63,7 +63,7 @@ config BR2_PACKAGE_NODEJS_VERSION_STRING string default "0.10.40" if BR2_BR2_PACKAGE_NODEJS_0_10_X default "0.12.7" if BR2_BR2_PACKAGE_NODEJS_0_12_X - default "4.1.2" if BR2_BR2_PACKAGE_NODEJS_4_X + default "4.2.2" if BR2_BR2_PACKAGE_NODEJS_4_X menu "Module Selection"
package/nodejs/nodejs.hash +2 -2
@@ -4,5 +4,5 @@ sha256 bae79c2fd959aebe1629af36077bebbb760128db753da226d2344cd91499149f node-v0 # From upstream URL: http://nodejs.org/dist/v0.12.7/SHASUMS256.txt sha256 b23d64df051c9c969b0c583f802d5d71de342e53067127a5061415be7e12f39d node-v0.12.7.tar.gz -# From upstream URL: http://nodejs.org/dist/v4.1.2/SHASUMS256.txt -sha256 443c8251e812b1f2c4b3e9152a47df23c55567ade739e017e2c0ca0869b71e74 node-v4.1.2.tar.xz +# From upstream URL: http://nodejs.org/dist/v4.2.2/SHASUMS256.txt +sha256 b016c3d2f434f86d8d3da9ad90ffb2fd35b32223e9081e3d4f67b8de0370ce69 node-v4.2.2.tar.xz
package/nodejs/nodejs.mk +4 -2
@@ -61,7 +61,8 @@ NODEJS_CPU = mipsel else ifeq ($(BR2_arm),y) NODEJS_CPU = arm # V8 needs to know what floating point ABI the target is using. -NODEJS_ARM_FP = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) +NODEJS_ARM_FLOAT_ABI = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) +NODEJS_ARM_FPU = $(call qstrip,$(BR2_GCC_TARGET_FPU)) endif define NODEJS_CONFIGURE_CMDS
@@ -78,7 +79,8 @@ define NODEJS_CONFIGURE_CMDS --without-dtrace \ --without-etw \ --dest-cpu=$(NODEJS_CPU) \ - $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ + $(if $(NODEJS_ARM_FLOAT_ABI),--with-arm-float-abi=$(NODEJS_ARM_FLOAT_ABI)) \ + $(if $(NODEJS_ARM_FPU),--with-arm-fpu=$(NODEJS_ARM_FPU)) \ --dest-os=linux \ ) endef
Signature · 1 line
2.5.0
PATCH 1/1 package/nodejs: bump version to 4.2.2
Hi Martin,
Quoted 1 line · Martin Bark
v4.2.2 is the current Long Term Support (LTS) version
Agree, would be nice to have that in BR.
Quoted 9 lines
Moved all v4.1.2 patches to v4.2.2 except 0004-fix-arm-vfpv2.patch as this is no longer needed. Instead use the new --with-arm-fpu configure option. See https://github.com/nodejs/node/issues/2942 and
https://github.com/nodejs/node/pull/3228.Also, with the introduction of --with-arm-fpu rename
NODEJS_ARM_FPtoNODEJS_ARM_FLOAT_ABIto make nodejs.mk more readable.Signed-off-by Martin Bark <[email protected]>
This looks good (not tested yet, will do wednesday), however: I think BR would also benefit on a global level for something like this. Something like that was hinted in one of the previous nodejs emails.
regards,
Jaap