Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -7,19 +7,19 @@ config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS
|
||||
# libuv
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
|
||||
comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.8, wchar"
|
||||
comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.9, wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR
|
||||
!BR2_HOST_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_NODEJS
|
||||
bool "nodejs"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_8
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on BR2_USE_WCHAR
|
||||
# uses fork()
|
||||
depends on BR2_USE_MMU
|
||||
@@ -27,7 +27,6 @@ config BR2_PACKAGE_NODEJS
|
||||
# linking, but that's too much of a corner case to support it.
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_C_ARES
|
||||
select BR2_PACKAGE_LIBHTTPPARSER
|
||||
select BR2_PACKAGE_LIBUV
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_NGHTTP2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://nodejs.org/dist/v8.17.0/SHASUMS256.txt
|
||||
sha256 5b0d96db482b273f0324c299ead86ecfbc5d033516e5fc37c92cfccb933ef6ff node-v8.17.0.tar.xz
|
||||
# From https://nodejs.org/dist/v12.16.1/SHASUMS256.txt
|
||||
sha256 0a95845ba02c46102b5671d0c5732460073f2d397488337e18d1fc30146d412d node-v12.16.1.tar.xz
|
||||
|
||||
# Hash for license file
|
||||
sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE
|
||||
sha256 3f5749f7a58edaadd77843057a90063a18067f472d8b26c0a76905cafa1063e3 LICENSE
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NODEJS_VERSION = 8.17.0
|
||||
NODEJS_VERSION = 12.16.1
|
||||
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
|
||||
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
|
||||
NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \
|
||||
libhttpparser libuv zlib nghttp2 \
|
||||
libuv zlib nghttp2 \
|
||||
$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
|
||||
HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib
|
||||
NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
|
||||
@@ -18,11 +18,11 @@ NODEJS_CONF_OPTS = \
|
||||
--without-snapshot \
|
||||
--shared-zlib \
|
||||
--shared-cares \
|
||||
--shared-http-parser \
|
||||
--shared-libuv \
|
||||
--shared-nghttp2 \
|
||||
--without-dtrace \
|
||||
--without-etw \
|
||||
--cross-compiling \
|
||||
--dest-os=linux
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
@@ -64,10 +64,18 @@ define HOST_NODEJS_CONFIGURE_CMDS
|
||||
--shared-openssl-includes=$(HOST_DIR)/include/openssl \
|
||||
--shared-openssl-libpath=$(HOST_DIR)/lib \
|
||||
--shared-zlib \
|
||||
--with-intl=none \
|
||||
--no-cross-compiling \
|
||||
--with-intl=small-icu \
|
||||
)
|
||||
endef
|
||||
|
||||
NODEJS_HOST_TOOLS_V8 = \
|
||||
torque \
|
||||
gen-regexp-special-case \
|
||||
bytecode_builtins_list_generator
|
||||
NODEJS_HOST_TOOLS_NODE = mkcodecache
|
||||
NODEJS_HOST_TOOLS = $(NODEJS_HOST_TOOLS_V8) $(NODEJS_HOST_TOOLS_NODE)
|
||||
|
||||
define HOST_NODEJS_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
|
||||
$(MAKE) -C $(@D) \
|
||||
@@ -84,6 +92,10 @@ define HOST_NODEJS_INSTALL_CMDS
|
||||
LDFLAGS.host="$(HOST_LDFLAGS)" \
|
||||
NO_LOAD=cctest.target.mk \
|
||||
PATH=$(@D)/bin:$(BR_PATH)
|
||||
|
||||
$(foreach f,$(NODEJS_HOST_TOOLS), \
|
||||
$(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f)
|
||||
)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_i386),y)
|
||||
@@ -127,6 +139,12 @@ NODEJS_MIPS_ARCH_VARIANT = r1
|
||||
endif
|
||||
endif
|
||||
|
||||
NODEJS_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
NODEJS_LDFLAGS += -latomic
|
||||
endif
|
||||
|
||||
define NODEJS_CONFIGURE_CMDS
|
||||
mkdir -p $(@D)/bin
|
||||
ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python
|
||||
@@ -134,6 +152,7 @@ define NODEJS_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
PATH=$(@D)/bin:$(BR_PATH) \
|
||||
LDFLAGS="$(NODEJS_LDFLAGS)" \
|
||||
LD="$(TARGET_CXX)" \
|
||||
PYTHON=$(HOST_DIR)/bin/python2 \
|
||||
$(HOST_DIR)/bin/python2 ./configure \
|
||||
@@ -145,6 +164,15 @@ define NODEJS_CONFIGURE_CMDS
|
||||
$(if $(NODEJS_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_MIPS_FPU_MODE)) \
|
||||
$(NODEJS_CONF_OPTS) \
|
||||
)
|
||||
|
||||
$(foreach f,$(NODEJS_HOST_TOOLS_V8), \
|
||||
$(SED) "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/$(f)#" \
|
||||
$(@D)/tools/v8_gypfiles/v8.gyp
|
||||
)
|
||||
$(foreach f,$(NODEJS_HOST_TOOLS_NODE), \
|
||||
$(SED) "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/$(f)#" \
|
||||
-i $(@D)/node.gyp
|
||||
)
|
||||
endef
|
||||
|
||||
define NODEJS_BUILD_CMDS
|
||||
@@ -153,6 +181,7 @@ define NODEJS_BUILD_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
NO_LOAD=cctest.target.mk \
|
||||
PATH=$(@D)/bin:$(BR_PATH) \
|
||||
LDFLAGS="$(NODEJS_LDFLAGS)" \
|
||||
LD="$(TARGET_CXX)"
|
||||
endef
|
||||
|
||||
@@ -164,6 +193,7 @@ NODEJS_MODULES_LIST= $(call qstrip,\
|
||||
|
||||
# Define NPM for other packages to use
|
||||
NPM = $(TARGET_CONFIGURE_OPTS) \
|
||||
LDFLAGS="$(NODEJS_LDFLAGS)" \
|
||||
LD="$(TARGET_CXX)" \
|
||||
npm_config_arch=$(NODEJS_CPU) \
|
||||
npm_config_target_arch=$(NODEJS_CPU) \
|
||||
@@ -192,6 +222,7 @@ define NODEJS_INSTALL_TARGET_CMDS
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
NO_LOAD=cctest.target.mk \
|
||||
PATH=$(@D)/bin:$(BR_PATH) \
|
||||
LDFLAGS="$(NODEJS_LDFLAGS)" \
|
||||
LD="$(TARGET_CXX)"
|
||||
$(NODEJS_INSTALL_MODULES)
|
||||
endef
|
||||
|
||||
Reference in New Issue
Block a user