From a0a18df42cc834292d71ce2bf3a404c24a5f4cd8 Mon Sep 17 00:00:00 2001 From: Hirokazu MORIKAWA Date: Thu, 19 Mar 2020 16:13:31 +0900 Subject: [PATCH] node: Change icu version specification modify host icu library path Signed-off-by: Hirokazu MORIKAWA --- lang/node/Makefile | 10 +++++++--- ...delete_unnecessary_libraries_for_host_execute.patch | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lang/node/Makefile b/lang/node/Makefile index f836f4660..5b368c13e 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node PKG_VERSION:=v12.16.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz 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 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. - *** 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 define Package/node-npm @@ -93,7 +97,7 @@ endif MAKE_VARS+= \ 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:= \ CC="$(TARGET_CC) $(TARGET_OPTIMIZATION)" \ diff --git a/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch b/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch index dc473b9c7..36ef76f1f 100644 --- a/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch +++ b/lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch @@ -47,7 +47,7 @@ 'target_name': 'mksnapshot', 'type': 'executable', + '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': [ 'v8_base_without_compiler', 'v8_compiler_for_mksnapshot', @@ -72,7 +72,7 @@ 'target_name': 'gen-regexp-special-case', 'type': 'executable', + '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': [ 'v8_libbase', # "build/win:default_exe_manifest",