Commit f443386c authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

package/nodejs: fix architectural dependencies on ARM 



On ARM, starting with v0.12.x, the V8 JS engine is now requires at least
an armv6 and at least a VFPv2.

Since we're about to introduce the v4.x version, which has the same
requirements, introduce an intermediate variable to hold that condition.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Jörg Krause <joerg.krause@embedded.rocks>
Cc: Martin Bark <martin@barkynet.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b312807f

package/nodejs/Config.in

+10 −2
Original line number Diff line number Diff line
@@ -25,6 +25,15 @@ comment "nodejs needs a toolchain w/ C++, dynamic library, threads" 


if BR2_PACKAGE_NODEJS



# Starting with 0.12.x, on ARM, V8 (the JS engine)

# now requires an armv6+ and a VFPv2+.

config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS

	bool

	# On supported architectures other than ARM, no special requirement

	default y if !BR2_arm

	# On ARM, at least ARMv6+ with VFPv2+ is needed

	default y if !BR2_ARM_CPU_ARMV5 && BR2_ARM_CPU_HAS_VFPV2



choice

	prompt "Node.js version"

	default BR2_BR2_PACKAGE_NODEJS_0_10_X if BR2_ARM_CPU_ARMV5
@@ -35,10 +44,9 @@ choice 
config BR2_BR2_PACKAGE_NODEJS_0_10_X

	bool "v0.10.40"



# V8 included with v0.12.5 requires at least ARMv6

config BR2_BR2_PACKAGE_NODEJS_0_12_X

	bool "v0.12.7"

	depends on !BR2_ARM_CPU_ARMV5

	depends on BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS



endchoice