Merge pull request #11655 from nxhack/node_follow_icu_version

node: Change icu version specification
This commit is contained in:
Rosen Penev 2020-03-24 03:20:34 -07:00 committed by GitHub
commit eef3d14af7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=node PKG_NAME:=node
PKG_VERSION:=v12.16.1 PKG_VERSION:=v12.16.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION) PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
@ -47,7 +47,11 @@ define Package/node/description
Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine. Node.js uses
an event-driven, non-blocking I/O model that makes it lightweight and efficient. Node.js' an event-driven, non-blocking I/O model that makes it lightweight and efficient. Node.js'
package ecosystem, npm, is the largest ecosystem of open source libraries in the world. package ecosystem, npm, is the largest ecosystem of open source libraries in the world.
*** Requires GCC/G++ Multilib on host system to build 32-bit target *** *** The following preparations must be made on the host side. ***
1. gcc 6.3 or higher is required.
2. To build a 32-bit target, gcc-multilib, g++-multilib are required.
3. Requires libatomic package. (If necessary, install the 32-bit library at the same time.)
ex) sudo apt-get install gcc-multilib g++-multilib
endef endef
define Package/node-npm define Package/node-npm
@ -93,7 +97,7 @@ endif
MAKE_VARS+= \ MAKE_VARS+= \
DESTCPU=$(NODEJS_CPU) \ DESTCPU=$(NODEJS_CPU) \
LD_LIBRARY_PATH=$(STAGING_DIR_HOSTPKG)/share/icu/65.1/lib LD_LIBRARY_PATH=$(STAGING_DIR_HOSTPKG)/share/icu/current/lib
CONFIGURE_VARS:= \ CONFIGURE_VARS:= \
CC="$(TARGET_CC) $(TARGET_OPTIMIZATION)" \ CC="$(TARGET_CC) $(TARGET_OPTIMIZATION)" \

View file

@ -47,7 +47,7 @@
'target_name': 'mksnapshot', 'target_name': 'mksnapshot',
'type': 'executable', 'type': 'executable',
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ], + 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/65.1/lib' ], + 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
'dependencies': [ 'dependencies': [
'v8_base_without_compiler', 'v8_base_without_compiler',
'v8_compiler_for_mksnapshot', 'v8_compiler_for_mksnapshot',
@ -72,7 +72,7 @@
'target_name': 'gen-regexp-special-case', 'target_name': 'gen-regexp-special-case',
'type': 'executable', 'type': 'executable',
+ 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ], + 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ],
+ 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/65.1/lib' ], + 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ],
'dependencies': [ 'dependencies': [
'v8_libbase', 'v8_libbase',
# "build/win:default_exe_manifest", # "build/win:default_exe_manifest",