deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/nodejs: bump version to 12.12.0

Browse source 
Removed libhttpparser dependency as nodejs now uses built in llhttp.

Installed additional build tools to host that are required for target build.

License file change is due to 3rd party dependency changes and date updates.

Dependencies still appear to have Apache and BSD family licenses.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
James Hilliard 2019-10-16 10:57:05 -06:00 committed by Thomas Petazzoni
parent 96c37418b7
commit 55b976b806
3 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/nodejs/Config.in
View file

@ -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

6
package/nodejs/nodejs.hash
View file

@ -1,5 +1,5 @@
# From https://nodejs.org/dist/v10.16.3/SHASUMS256.txt
sha256 7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd node-v10.16.3.tar.xz
# From https://nodejs.org/dist/v12.12.0/SHASUMS256.txt
sha256 d9fa875aba9764f1b919115ce1d5e828b02c2a55a6e9e1b6fc771bb6b24a8cc1 node-v12.12.0.tar.xz
# Hash for license file
sha256 2b0fe00a83916d0290c8531db25a827e18d01e7c4bf000e9a0f2e826604ba41e LICENSE
sha256 950bbc741dc021489c47683e34e7637e9b96fb4a1f430b2f77a744130516e293 LICENSE

35
package/nodejs/nodejs.mk
View file

@ -4,11 +4,11 @@
#
################################################################################
NODEJS_VERSION = 10.16.3
NODEJS_VERSION = 12.12.0
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 host-patchelf
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) \
@ -75,7 +83,9 @@ define HOST_NODEJS_BUILD_CMDS
NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH)
$(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib $(@D)/out/Release/torque
$(foreach f,$(NODEJS_HOST_TOOLS), \
$(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib $(@D)/out/Release/$(f)
)
endef
define HOST_NODEJS_INSTALL_CMDS
@ -85,7 +95,9 @@ define HOST_NODEJS_INSTALL_CMDS
NO_LOAD=cctest.target.mk \
PATH=$(@D)/bin:$(BR_PATH)
$(INSTALL) -m755 -D $(@D)/out/Release/torque $(HOST_DIR)/bin/torque
$(foreach f,$(NODEJS_HOST_TOOLS), \
$(INSTALL) -m755 -D $(@D)/out/Release/$(f) $(HOST_DIR)/bin/$(f)
)
endef
ifeq ($(BR2_i386),y)
@ -141,9 +153,14 @@ define NODEJS_CONFIGURE_CMDS
$(NODEJS_CONF_OPTS) \
)
# use host version of torque
sed "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/torque#" \
-i $(@D)/deps/v8/gypfiles/v8.gyp
$(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