Browse Source

Merge pull request #13205 from nxhack/node_12_16_2

node: update to v12.18.3
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
172586e318
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 18 deletions
  1. +3
    -3
      lang/node/Makefile
  2. +1
    -1
      lang/node/patches/003-path.patch
  3. +3
    -3
      lang/node/patches/006-mips64_support.patch
  4. +5
    -5
      lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch
  5. +4
    -6
      lang/node/patches/999-v8_this_build_method_will_be_deprecated.patch

+ 3
- 3
lang/node/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=node PKG_NAME:=node
PKG_VERSION:=v12.16.1
PKG_RELEASE:=2
PKG_VERSION:=v12.18.3
PKG_RELEASE:=1
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)
PKG_HASH:=0a95845ba02c46102b5671d0c5732460073f2d397488337e18d1fc30146d412d
PKG_HASH:=71158026579487422fd13cc2553b34cddb76519098aa6030faab52f88c6e0d0e
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Adrian Panella <ianchi74@outlook.com> PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Adrian Panella <ianchi74@outlook.com>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT


+ 1
- 1
lang/node/patches/003-path.patch View File

@ -1,6 +1,6 @@
--- a/lib/internal/modules/cjs/loader.js --- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js
@@ -1260,7 +1260,8 @@
@@ -1239,7 +1239,8 @@
path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..') :
path.resolve(process.execPath, '..', '..'); path.resolve(process.execPath, '..', '..');


+ 3
- 3
lang/node/patches/006-mips64_support.patch View File

@ -9,7 +9,7 @@
'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x') 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x')
valid_arm_float_abi = ('soft', 'softfp', 'hard') valid_arm_float_abi = ('soft', 'softfp', 'hard')
valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
@@ -896,6 +896,9 @@
@@ -956,6 +956,9 @@
if rtn == 'mipsel' and '_LP64' in k: if rtn == 'mipsel' and '_LP64' in k:
rtn = 'mips64el' rtn = 'mips64el'
@ -19,12 +19,12 @@
return rtn return rtn
@@ -1001,7 +1004,7 @@
@@ -1063,7 +1066,7 @@
if target_arch == 'arm': if target_arch == 'arm':
configure_arm(o) configure_arm(o)
- elif target_arch in ('mips', 'mipsel', 'mips64el'): - elif target_arch in ('mips', 'mipsel', 'mips64el'):
+ elif target_arch in ('mips', 'mipsel', 'mips64', 'mips64el'): + elif target_arch in ('mips', 'mipsel', 'mips64', 'mips64el'):
configure_mips(o)
configure_mips(o, target_arch)
if flavor == 'aix': if flavor == 'aix':

+ 5
- 5
lang/node/patches/999-delete_unnecessary_libraries_for_host_execute.patch View File

@ -34,7 +34,7 @@
'<@(icu_src_genccode)', '<@(icu_src_genccode)',
--- a/tools/v8_gypfiles/v8.gyp 2019-06-27 19:12:20.000000000 +0900 --- a/tools/v8_gypfiles/v8.gyp 2019-06-27 19:12:20.000000000 +0900
+++ b/tools/v8_gypfiles/v8.gyp 2019-07-01 14:40:48.292020880 +0900 +++ b/tools/v8_gypfiles/v8.gyp 2019-07-01 14:40:48.292020880 +0900
@@ -1265,6 +1265,7 @@
@@ -1255,6 +1255,7 @@
{ {
'target_name': 'bytecode_builtins_list_generator', 'target_name': 'bytecode_builtins_list_generator',
'type': 'executable', 'type': 'executable',
@ -42,7 +42,7 @@
'conditions': [ 'conditions': [
['want_separate_host_toolset', { ['want_separate_host_toolset', {
'toolsets': ['host'], 'toolsets': ['host'],
@@ -1288,6 +1289,8 @@
@@ -1278,6 +1279,8 @@
{ {
'target_name': 'mksnapshot', 'target_name': 'mksnapshot',
'type': 'executable', 'type': 'executable',
@ -51,7 +51,7 @@
'dependencies': [ 'dependencies': [
'v8_base_without_compiler', 'v8_base_without_compiler',
'v8_compiler_for_mksnapshot', 'v8_compiler_for_mksnapshot',
@@ -1310,6 +1313,7 @@
@@ -1300,6 +1303,7 @@
{ {
'target_name': 'torque', 'target_name': 'torque',
'type': 'executable', 'type': 'executable',
@ -59,7 +59,7 @@
'dependencies': [ 'dependencies': [
'torque_base', 'torque_base',
# "build/win:default_exe_manifest", # "build/win:default_exe_manifest",
@@ -1348,6 +1352,7 @@
@@ -1338,6 +1342,7 @@
{ {
'target_name': 'torque-language-server', 'target_name': 'torque-language-server',
'type': 'executable', 'type': 'executable',
@ -67,7 +67,7 @@
'conditions': [ 'conditions': [
['want_separate_host_toolset', { ['want_separate_host_toolset', {
'toolsets': ['host'], 'toolsets': ['host'],
@@ -1375,6 +1380,8 @@
@@ -1365,6 +1370,8 @@
{ {
'target_name': 'gen-regexp-special-case', 'target_name': 'gen-regexp-special-case',
'type': 'executable', 'type': 'executable',


+ 4
- 6
lang/node/patches/999-v8_this_build_method_will_be_deprecated.patch View File

@ -1,7 +1,7 @@
diff -urN a/configure.py b/configure.py diff -urN a/configure.py b/configure.py
--- a/configure.py 2019-09-05 00:36:21.000000000 +0900 --- a/configure.py 2019-09-05 00:36:21.000000000 +0900
+++ b/configure.py 2019-09-27 11:49:55.445800884 +0900 +++ b/configure.py 2019-09-27 11:49:55.445800884 +0900
@@ -1223,6 +1223,25 @@
@@ -1276,6 +1276,23 @@
options.build_v8_with_gn = FetchDeps(v8_path) options.build_v8_with_gn = FetchDeps(v8_path)
o['variables']['build_v8_with_gn'] = b(options.build_v8_with_gn) o['variables']['build_v8_with_gn'] = b(options.build_v8_with_gn)
@ -17,17 +17,15 @@ diff -urN a/configure.py b/configure.py
+ elif target_arch in ('mipsel', 'mips64el'): + elif target_arch in ('mipsel', 'mips64el'):
+ o['variables']['v8_enable_embedded_builtins'] = 0 + o['variables']['v8_enable_embedded_builtins'] = 0
+ elif target_arch == 'x64': + elif target_arch == 'x64':
+ if options.with_intl in (None, 'none'):
+ o['variables']['v8_enable_embedded_builtins'] = 1
+ if options.with_intl not in (None, 'none'):
+ o['variables']['v8_enable_embedded_builtins'] = 0
+ elif target_arch == 'ia32': + elif target_arch == 'ia32':
+ if options.with_intl in (None, 'none'): + if options.with_intl in (None, 'none'):
+ o['variables']['v8_use_snapshot'] = 'false' + o['variables']['v8_use_snapshot'] = 'false'
+ else:
+ o['variables']['v8_enable_embedded_builtins'] = 0
def configure_openssl(o): def configure_openssl(o):
variables = o['variables'] variables = o['variables']
@@ -1654,6 +1673,7 @@
@@ -1713,6 +1732,7 @@
configure_intl(output) configure_intl(output)
configure_static(output) configure_static(output)
configure_inspector(output) configure_inspector(output)


Loading…
Cancel
Save