Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
From 7fa541f6c0a31e3ddcab6ea85040b531bbaa4651 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Tue, 12 Jul 2016 19:03:28 +0100
|
||||
Subject: [PATCH] inspector: don't build when ssl support is disabled
|
||||
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
---
|
||||
node.gyp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/node.gyp b/node.gyp
|
||||
index 8a8bd00..fdccd60 100644
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -302,7 +302,7 @@
|
||||
'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune'
|
||||
],
|
||||
}],
|
||||
- [ 'v8_inspector=="true"', {
|
||||
+ [ 'v8_inspector=="true" and node_use_openssl =="true"', {
|
||||
'defines': [
|
||||
'HAVE_INSPECTOR=1',
|
||||
'V8_INSPECTOR_USE_STL=1',
|
||||
@@ -828,7 +828,7 @@
|
||||
],
|
||||
|
||||
'conditions': [
|
||||
- ['v8_inspector=="true"', {
|
||||
+ ['v8_inspector=="true" and node_use_openssl =="true"', {
|
||||
'sources': [
|
||||
'src/inspector_socket.cc',
|
||||
'test/cctest/test_inspector_socket.cc'
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
comment "nodejs needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.8, wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
|
||||
depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel
|
||||
depends on !BR2_MIPS_SOFT_FLOAT
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
@@ -10,7 +10,7 @@ config BR2_PACKAGE_NODEJS
|
||||
bool "nodejs"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
|
||||
depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel
|
||||
depends on !BR2_MIPS_SOFT_FLOAT
|
||||
# ARM needs BLX, so v5t+
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
@@ -43,8 +43,8 @@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
|
||||
config BR2_PACKAGE_NODEJS_VERSION_STRING
|
||||
string
|
||||
default "6.2.1" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
default "0.10.45"
|
||||
default "6.9.4" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
|
||||
default "0.10.48"
|
||||
|
||||
config BR2_PACKAGE_NODEJS_NPM
|
||||
bool "NPM for the target"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From upstream URL: http://nodejs.org/dist/v0.10.45/SHASUMS256.txt
|
||||
sha256 a71070ea7aece9c94450b45102f2d1be42f0add168dd9c9701e9032d363bd4fa node-v0.10.45.tar.xz
|
||||
# From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt
|
||||
sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz
|
||||
|
||||
# From upstream URL: http://nodejs.org/dist/v6.2.1/SHASUMS256.txt
|
||||
sha256 dbaeb8fb68a599e5164b17c74f66d24f424ee4ab3a25d8de8a3c6808e5b42bfb node-v6.2.1.tar.xz
|
||||
# From upstream URL: http://nodejs.org/dist/v6.9.4/SHASUMS256.txt
|
||||
sha256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 node-v6.9.4.tar.xz
|
||||
|
||||
@@ -63,6 +63,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
|
||||
--without-dtrace \
|
||||
--without-etw \
|
||||
--shared-zlib \
|
||||
$(if $(BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS),--with-intl=none) \
|
||||
)
|
||||
endef
|
||||
|
||||
@@ -90,18 +91,20 @@ else ifeq ($(BR2_mipsel),y)
|
||||
NODEJS_CPU = mipsel
|
||||
else ifeq ($(BR2_arm),y)
|
||||
NODEJS_CPU = arm
|
||||
else ifeq ($(BR2_aarch64),y)
|
||||
NODEJS_CPU = arm64
|
||||
# V8 needs to know what floating point ABI the target is using.
|
||||
NODEJS_ARM_FP = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
|
||||
endif
|
||||
|
||||
# MIPS architecture specific options
|
||||
ifeq ($(BR2_mips)$(BR2_mipsel),y)
|
||||
ifeq ($(BR2_mips_32r6),y)
|
||||
ifeq ($(BR2_MIPS_CPU_MIPS32R6),y)
|
||||
NODEJS_MIPS_ARCH_VARIANT = r6
|
||||
NODEJS_MIPS_FPU_MODE = fp64
|
||||
else ifeq ($(BR2_mips_32r2),y)
|
||||
else ifeq ($(BR2_MIPS_CPU_MIPS32R2),y)
|
||||
NODEJS_MIPS_ARCH_VARIANT = r2
|
||||
else ifeq ($(BR2_mips_32),y)
|
||||
else ifeq ($(BR2_MIPS_CPU_MIPS32),y)
|
||||
NODEJS_MIPS_ARCH_VARIANT = r1
|
||||
endif
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user