mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-08-03 00:17:43 +00:00
package/nodejs: bump 4.x branch to version 4.2.3
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
9d3b69dfdd
commit
584d777dda
@ -1,18 +0,0 @@
|
|||||||
configure: fix ARM VFPv2
|
|
||||||
|
|
||||||
The gcc -mfpu flag for VFPv2 is 'vfp', not 'vfpv2'.
|
|
||||||
|
|
||||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
||||||
|
|
||||||
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
|
|
46
package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch
Normal file
46
package/nodejs/4.2.3/0004-fix-arm-vfpv2.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
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
|
@ -49,11 +49,11 @@ config BR2_BR2_PACKAGE_NODEJS_0_12_X
|
|||||||
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||||
|
|
||||||
config BR2_BR2_PACKAGE_NODEJS_4_X
|
config BR2_BR2_PACKAGE_NODEJS_4_X
|
||||||
bool "v4.1.2"
|
bool "v4.2.3"
|
||||||
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
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
|
||||||
|
|
||||||
comment "v4.1.2 needs a toolchain w/ gcc >= 4.8"
|
comment "v4.2.3 needs a toolchain w/ gcc >= 4.8"
|
||||||
depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
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
|
||||||
|
|
||||||
@ -63,7 +63,7 @@ config BR2_PACKAGE_NODEJS_VERSION_STRING
|
|||||||
string
|
string
|
||||||
default "0.10.41" if BR2_BR2_PACKAGE_NODEJS_0_10_X
|
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 "0.12.9" if BR2_BR2_PACKAGE_NODEJS_0_12_X
|
||||||
default "4.1.2" if BR2_BR2_PACKAGE_NODEJS_4_X
|
default "4.2.3" if BR2_BR2_PACKAGE_NODEJS_4_X
|
||||||
|
|
||||||
menu "Module Selection"
|
menu "Module Selection"
|
||||||
|
|
||||||
|
@ -4,5 +4,5 @@ sha256 79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995 node-v0
|
|||||||
# From upstream URL: http://nodejs.org/dist/v0.12.9/SHASUMS256.txt
|
# From upstream URL: http://nodejs.org/dist/v0.12.9/SHASUMS256.txt
|
||||||
sha256 35daad301191e5f8dd7e5d2fbb711d081b82d1837d59837b8ee224c256cfe5e4 node-v0.12.9.tar.gz
|
sha256 35daad301191e5f8dd7e5d2fbb711d081b82d1837d59837b8ee224c256cfe5e4 node-v0.12.9.tar.gz
|
||||||
|
|
||||||
# From upstream URL: http://nodejs.org/dist/v4.1.2/SHASUMS256.txt
|
# From upstream URL: http://nodejs.org/dist/v4.2.3/SHASUMS256.txt
|
||||||
sha256 443c8251e812b1f2c4b3e9152a47df23c55567ade739e017e2c0ca0869b71e74 node-v4.1.2.tar.xz
|
sha256 9e8aef1e47b317575c421c8d10a80e6c319b26969b566d3b84e49e65a92837f4 node-v4.2.3.tar.xz
|
||||||
|
Loading…
x
Reference in New Issue
Block a user