From e225d9a4ddc155b46e3859f41d53111f57db7091 Mon Sep 17 00:00:00 2001 From: MCApollo <34170230+MCApollo@users.noreply.github.com> Date: Sat, 25 May 2019 15:35:33 +0000 Subject: . --- data/node/_metadata/cares.dep | 1 + data/node/_metadata/libssl1.0.dep | 1 - data/node/_metadata/libssl1.1.dep | 1 + data/node/configure-ios.diff | 161 ++++++++++-------- data/node/configure-ios.diff- | 339 ++++++++++++++++++++++++++++++++++++++ data/node/gyp.diff | 8 - data/node/make.sh | 13 +- data/node/node-v12.2.0.tar.gz | Bin 49056589 -> 0 bytes data/node/node-v12.3.1.tar.gz | Bin 0 -> 49112048 bytes data/node/v8.diff | 62 ++++--- 10 files changed, 485 insertions(+), 101 deletions(-) create mode 120000 data/node/_metadata/cares.dep delete mode 120000 data/node/_metadata/libssl1.0.dep create mode 120000 data/node/_metadata/libssl1.1.dep create mode 100644 data/node/configure-ios.diff- delete mode 100644 data/node/node-v12.2.0.tar.gz create mode 100644 data/node/node-v12.3.1.tar.gz diff --git a/data/node/_metadata/cares.dep b/data/node/_metadata/cares.dep new file mode 120000 index 000000000..4e3a4f848 --- /dev/null +++ b/data/node/_metadata/cares.dep @@ -0,0 +1 @@ +../../cares \ No newline at end of file diff --git a/data/node/_metadata/libssl1.0.dep b/data/node/_metadata/libssl1.0.dep deleted file mode 120000 index a501d00a8..000000000 --- a/data/node/_metadata/libssl1.0.dep +++ /dev/null @@ -1 +0,0 @@ -../../libssl1.0 \ No newline at end of file diff --git a/data/node/_metadata/libssl1.1.dep b/data/node/_metadata/libssl1.1.dep new file mode 120000 index 000000000..71bfa9edd --- /dev/null +++ b/data/node/_metadata/libssl1.1.dep @@ -0,0 +1 @@ +../../libssl1.1 \ No newline at end of file diff --git a/data/node/configure-ios.diff b/data/node/configure-ios.diff index 59c6d1fa5..053234802 100644 --- a/data/node/configure-ios.diff +++ b/data/node/configure-ios.diff @@ -1,6 +1,6 @@ -diff -ur node-v12.2.0/common.gypi node-v12.2.0+iPhone/common.gypi ---- node-v12.2.0/common.gypi 2019-05-07 14:52:12.000000000 +0000 -+++ node-v12.2.0+iPhone/common.gypi 2019-05-23 07:31:51.350642966 +0000 +diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi +--- node-v12.3.1/common.gypi 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/common.gypi 2019-05-25 00:16:01.809813352 +0000 @@ -95,7 +95,7 @@ 'os_posix': 1, 'v8_postmortem_support%': 1, @@ -46,23 +46,29 @@ diff -ur node-v12.2.0/common.gypi node-v12.2.0+iPhone/common.gypi 'xcode_settings': { 'OTHER_CFLAGS+': [ '-fno-omit-frame-pointer', -@@ -425,7 +425,14 @@ +@@ -425,6 +425,21 @@ }], ], }], -- ['OS=="mac"', { + ['OS=="ios"', { ++ 'defines': [ ++ '__IPHONEOS__', ++ 'TARGET_OS_IPHONE', ++ 'V8_TARGET_OS_IPHONE', ++ '_DARWIN_USE_64_BIT_INODE', ++ '__AARCH64EL__', ++ '_M_ARM64', ++ ], + 'cflags': [ + '-fno-exceptions', + '-fno-rtti', + '-fno-strict-aliasing' + ], + }], -+ ['OS=="mac" or OS=="ios"', { + ['OS=="mac"', { 'defines': ['_DARWIN_USE_64_BIT_INODE=1'], 'xcode_settings': { - 'ALWAYS_SEARCH_USER_PATHS': 'NO', -@@ -436,7 +443,6 @@ +@@ -436,7 +451,6 @@ 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings 'PREBINDING': 'NO', # No -Wl,-prebind @@ -70,7 +76,7 @@ diff -ur node-v12.2.0/common.gypi node-v12.2.0+iPhone/common.gypi 'USE_HEADERMAP': 'NO', 'OTHER_CFLAGS': [ '-fno-strict-aliasing', -@@ -465,6 +471,9 @@ +@@ -465,6 +479,9 @@ ['target_arch=="x64"', { 'xcode_settings': {'ARCHS': ['x86_64']}, }], @@ -80,9 +86,9 @@ diff -ur node-v12.2.0/common.gypi node-v12.2.0+iPhone/common.gypi ['clang==1', { 'xcode_settings': { 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', -diff -ur node-v12.2.0/configure.py node-v12.2.0+iPhone/configure.py ---- node-v12.2.0/configure.py 2019-05-07 14:52:12.000000000 +0000 -+++ node-v12.2.0+iPhone/configure.py 2019-05-23 07:31:51.350642966 +0000 +diff -ur node-v12.3.1/configure.py node-v12.3.1+iPhone/configure.py +--- node-v12.3.1/configure.py 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/configure.py 2019-05-25 00:16:01.809813352 +0000 @@ -44,7 +44,7 @@ parser = optparse.OptionParser() @@ -115,9 +121,9 @@ diff -ur node-v12.2.0/configure.py node-v12.2.0+iPhone/configure.py shlib_suffix %= node_module_version o['variables']['node_module_version'] = int(node_module_version) -diff -ur node-v12.2.0/deps/brotli/brotli.gyp node-v12.2.0+iPhone/deps/brotli/brotli.gyp ---- node-v12.2.0/deps/brotli/brotli.gyp 2019-05-07 14:52:12.000000000 +0000 -+++ node-v12.2.0+iPhone/deps/brotli/brotli.gyp 2019-05-23 07:31:51.354642969 +0000 +diff -ur node-v12.3.1/deps/brotli/brotli.gyp node-v12.3.1+iPhone/deps/brotli/brotli.gyp +--- node-v12.3.1/deps/brotli/brotli.gyp 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/brotli/brotli.gyp 2019-05-25 00:16:01.809813352 +0000 @@ -15,7 +15,7 @@ 'OS_FREEBSD' ] @@ -127,9 +133,9 @@ diff -ur node-v12.2.0/deps/brotli/brotli.gyp node-v12.2.0+iPhone/deps/brotli/bro 'defines': [ 'OS_MACOSX' ] -diff -ur node-v12.2.0/deps/cares/cares.gyp node-v12.2.0+iPhone/deps/cares/cares.gyp ---- node-v12.2.0/deps/cares/cares.gyp 2019-05-07 14:52:12.000000000 +0000 -+++ node-v12.2.0+iPhone/deps/cares/cares.gyp 2019-05-23 07:31:51.354642969 +0000 +diff -ur node-v12.3.1/deps/cares/cares.gyp node-v12.3.1+iPhone/deps/cares/cares.gyp +--- node-v12.3.1/deps/cares/cares.gyp 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/cares/cares.gyp 2019-05-25 00:16:01.813813354 +0000 @@ -145,7 +145,7 @@ 'include_dirs': [ 'config/linux' ], 'sources': [ 'config/linux/ares_config.h' ] @@ -139,9 +145,9 @@ diff -ur node-v12.2.0/deps/cares/cares.gyp node-v12.2.0+iPhone/deps/cares/cares. 'include_dirs': [ 'config/darwin' ], 'sources': [ 'config/darwin/ares_config.h' ] }], -diff -ur node-v12.2.0/deps/npm/node_modules/node-gyp/addon.gypi node-v12.2.0+iPhone/deps/npm/node_modules/node-gyp/addon.gypi ---- node-v12.2.0/deps/npm/node_modules/node-gyp/addon.gypi 2019-05-07 14:52:13.000000000 +0000 -+++ node-v12.2.0+iPhone/deps/npm/node_modules/node-gyp/addon.gypi 2019-05-23 07:31:51.354642969 +0000 +diff -ur node-v12.3.1/deps/npm/node_modules/node-gyp/addon.gypi node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/addon.gypi +--- node-v12.3.1/deps/npm/node_modules/node-gyp/addon.gypi 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/addon.gypi 2019-05-25 00:16:01.813813354 +0000 @@ -79,7 +79,7 @@ ], @@ -151,9 +157,9 @@ diff -ur node-v12.2.0/deps/npm/node_modules/node-gyp/addon.gypi node-v12.2.0+iPh 'defines': [ '_DARWIN_USE_64_BIT_INODE=1' ], -diff -ur node-v12.2.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp node-v12.2.0+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp ---- node-v12.2.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-05-07 14:52:13.000000000 +0000 -+++ node-v12.2.0+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-05-23 07:31:51.354642969 +0000 +diff -ur node-v12.3.1/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp +--- node-v12.3.1/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-05-25 00:16:01.813813354 +0000 @@ -545,12 +545,12 @@ 'base/simd/scale_yuv_to_rgb_sse2_x64.asm', ], @@ -214,15 +220,15 @@ diff -ur node-v12.2.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/me 'conditions': [ ['linux_use_tcmalloc==1', { 'dependencies': [ -diff -ur node-v12.2.0/deps/uv/common.gypi node-v12.2.0+iPhone/deps/uv/common.gypi ---- node-v12.2.0/deps/uv/common.gypi 2019-05-07 14:52:14.000000000 +0000 -+++ node-v12.2.0+iPhone/deps/uv/common.gypi 2019-05-23 07:31:51.358642971 +0000 +diff -ur node-v12.3.1/deps/uv/common.gypi node-v12.3.1+iPhone/deps/uv/common.gypi +--- node-v12.3.1/deps/uv/common.gypi 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/uv/common.gypi 2019-05-25 00:16:01.813813354 +0000 @@ -168,6 +168,13 @@ }], ], }], + ['OS=="ios"', { -+ 'cflags': [ ++ 'cflags': [ + '-fno-exceptions', + '-fno-rtti', + '-fno-threadsafe-statics' @@ -231,19 +237,9 @@ diff -ur node-v12.2.0/deps/uv/common.gypi node-v12.2.0+iPhone/deps/uv/common.gyp ['OS=="mac"', { 'xcode_settings': { 'ALWAYS_SEARCH_USER_PATHS': 'NO', -@@ -195,6 +202,9 @@ - ['target_arch=="x64"', { - 'xcode_settings': {'ARCHS': ['x86_64']}, - }], -+ ['target_arch=="arm64"', { -+ 'xcode_settings': {'ARCHS': ['arm64']}, -+ }], - ], - 'target_conditions': [ - ['_type!="static_library"', { -diff -ur node-v12.2.0/deps/uv/uv.gyp node-v12.2.0+iPhone/deps/uv/uv.gyp ---- node-v12.2.0/deps/uv/uv.gyp 2019-05-07 14:52:14.000000000 +0000 -+++ node-v12.2.0+iPhone/deps/uv/uv.gyp 2019-05-23 07:31:51.358642971 +0000 +diff -ur node-v12.3.1/deps/uv/uv.gyp node-v12.3.1+iPhone/deps/uv/uv.gyp +--- node-v12.3.1/deps/uv/uv.gyp 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/uv/uv.gyp 2019-05-25 00:16:01.813813354 +0000 @@ -198,7 +198,7 @@ }], ], @@ -253,19 +249,30 @@ diff -ur node-v12.2.0/deps/uv/uv.gyp node-v12.2.0+iPhone/deps/uv/uv.gyp # This will cause gyp to set soname # Must correspond with UV_VERSION_MAJOR # in include/uv/version.h -diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp ---- node-v12.2.0/node.gyp 2019-05-07 14:52:15.000000000 +0000 -+++ node-v12.2.0+iPhone/node.gyp 2019-05-23 13:53:05.318455172 +0000 -@@ -545,6 +545,8 @@ - 'src/node_watchdog.cc', - 'src/node_worker.cc', - 'src/node_zlib.cc', -+ 'src/node_snapshot_stub.cc', -+ 'src/node_code_cache_stub.cc', - 'src/pipe_wrap.cc', - 'src/process_wrap.cc', - 'src/sharedarraybuffer_metadata.cc', -@@ -760,7 +762,7 @@ +diff -ur node-v12.3.1/node.gyp node-v12.3.1+iPhone/node.gyp +--- node-v12.3.1/node.gyp 2019-05-22 12:21:54.000000000 +0000 ++++ node-v12.3.1+iPhone/node.gyp 2019-05-25 12:01:52.868864501 +0000 +@@ -351,9 +351,8 @@ + 'conditions': [ + ['OS!="aix"', { + 'ldflags': [ +- '-Wl,--whole-archive,<(obj_dir)/<(STATIC_LIB_PREFIX)' ++ '-Wl,-force_load,<(obj_dir)/<(STATIC_LIB_PREFIX)' + '<(node_core_target_name)<(STATIC_LIB_SUFFIX)', +- '-Wl,--no-whole-archive', + ], + }], + [ 'OS=="win"', { +@@ -414,7 +413,7 @@ + }, + }, + }], +- ['want_separate_host_toolset==0', { ++ ['want_separate_host_toolset==1', { + 'dependencies': [ + 'mkcodecache', + ], +@@ -760,7 +759,7 @@ '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o' ], }], @@ -274,7 +281,7 @@ diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp 'sources': [ 'src/node_dtrace_ustack.cc', 'src/node_dtrace_provider.cc', -@@ -938,7 +940,7 @@ +@@ -939,7 +938,7 @@ 'target_name': 'node_dtrace_provider', 'type': 'none', 'conditions': [ @@ -283,7 +290,7 @@ diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp 'actions': [ { 'action_name': 'node_dtrace_provider_o', -@@ -973,7 +975,7 @@ +@@ -974,7 +973,7 @@ 'target_name': 'node_dtrace_ustack', 'type': 'none', 'conditions': [ @@ -292,10 +299,32 @@ diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp 'actions': [ { 'action_name': 'node_dtrace_ustack_constants', -diff -ur node-v12.2.0/node.gypi node-v12.2.0+iPhone/node.gypi ---- node-v12.2.0/node.gypi 2019-05-07 14:52:15.000000000 +0000 -+++ node-v12.2.0+iPhone/node.gypi 2019-05-23 07:31:51.358642971 +0000 -@@ -202,7 +202,7 @@ +diff -ur node-v12.3.1/node.gypi node-v12.3.1+iPhone/node.gypi +--- node-v12.3.1/node.gypi 2019-05-22 12:21:54.000000000 +0000 ++++ node-v12.3.1+iPhone/node.gypi 2019-05-25 12:03:43.012932500 +0000 +@@ -143,9 +143,8 @@ + 'conditions': [ + ['OS!="aix" and node_shared=="false"', { + 'ldflags': [ +- '-Wl,--whole-archive,' ++ '-Wl,-force_load,' + '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', +- '-Wl,--no-whole-archive', + ], + }], + ], +@@ -184,9 +183,8 @@ + 'conditions': [ + ['OS!="aix" and node_shared=="false"', { + 'ldflags': [ +- '-Wl,--whole-archive,' ++ '-Wl,-force_load,' + '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', +- '-Wl,--no-whole-archive', + ], + }], + ], +@@ -202,7 +200,7 @@ 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], }], @@ -304,9 +333,9 @@ diff -ur node-v12.2.0/node.gypi node-v12.2.0+iPhone/node.gypi # linking Corefoundation is needed since certain OSX debugging tools # like Instruments require it for some features 'libraries': [ '-framework CoreFoundation' ], -diff -ur node-v12.2.0/tools/v8_gypfiles/d8.gyp node-v12.2.0+iPhone/tools/v8_gypfiles/d8.gyp ---- node-v12.2.0/tools/v8_gypfiles/d8.gyp 2019-05-07 14:52:17.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/v8_gypfiles/d8.gyp 2019-05-23 07:31:51.358642971 +0000 +diff -ur node-v12.3.1/tools/v8_gypfiles/d8.gyp node-v12.3.1+iPhone/tools/v8_gypfiles/d8.gyp +--- node-v12.3.1/tools/v8_gypfiles/d8.gyp 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/d8.gyp 2019-05-25 00:16:01.817813355 +0000 @@ -43,7 +43,7 @@ 'd8_js2c#host', ], @@ -316,9 +345,9 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/d8.gyp node-v12.2.0+iPhone/tools/v8_gypf or OS=="openbsd" or OS=="solaris" or OS=="android" \ or OS=="qnx" or OS=="aix")', { 'sources': [ '../src/d8-posix.cc', ] -diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp ---- node-v12.2.0/tools/v8_gypfiles/v8.gyp 2019-05-07 14:52:17.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-23 07:31:51.362642972 +0000 +diff -ur node-v12.3.1/tools/v8_gypfiles/v8.gyp node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp +--- node-v12.3.1/tools/v8_gypfiles/v8.gyp 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-25 00:16:01.817813355 +0000 @@ -128,6 +128,12 @@ 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load'] }, diff --git a/data/node/configure-ios.diff- b/data/node/configure-ios.diff- new file mode 100644 index 000000000..e104a4026 --- /dev/null +++ b/data/node/configure-ios.diff- @@ -0,0 +1,339 @@ +diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi +--- node-v12.3.1/common.gypi 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/common.gypi 2019-05-24 23:00:22.300728306 +0000 +@@ -95,7 +95,7 @@ + 'os_posix': 1, + 'v8_postmortem_support%': 1, + }], +- ['OS == "mac"', { ++ ['OS == "mac" or OS=="ios"', { + 'obj_dir%': '<(PRODUCT_DIR)/obj.target', + 'v8_base': '<(PRODUCT_DIR)/libv8_base.a', + }], +@@ -104,7 +104,7 @@ + }, { + 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'clang%': 1, + }], + ], +@@ -172,7 +172,7 @@ + # pull in V8's postmortem metadata + 'ldflags': [ '-Wl,-z,allextract' ] + }], +- ['OS!="mac" and OS!="win"', { ++ ['OS!="mac" and OS!="ios" and OS!="win"', { + 'cflags': [ '-fno-omit-frame-pointer' ], + }], + ['OS=="linux"', { +@@ -293,7 +293,7 @@ + [ 'target_arch=="arm64"', { + 'msvs_configuration_platform': 'arm64', + }], +- ['asan == 1 and OS != "mac"', { ++ ['asan == 1 and (OS != "mac" or OS != "ios")', { + 'cflags+': [ + '-fno-omit-frame-pointer', + '-fsanitize=address', +@@ -302,7 +302,7 @@ + 'cflags!': [ '-fomit-frame-pointer' ], + 'ldflags': [ '-fsanitize=address' ], + }], +- ['asan == 1 and OS == "mac"', { ++ ['asan == 1 and (OS == "mac" or OS == "ios")', { + 'xcode_settings': { + 'OTHER_CFLAGS+': [ + '-fno-omit-frame-pointer', +@@ -425,6 +425,21 @@ + }], + ], + }], ++ ['OS=="ios"', { ++ 'defines': [ ++ '__IPHONEOS__', ++ 'TARGET_OS_IPHONE', ++ 'V8_TARGET_OS_IPHONE', ++ '_DARWIN_USE_64_BIT_INODE', ++ '__AARCH64EL__', ++ '_M_ARM64', ++ ], ++ 'cflags': [ ++ '-fno-exceptions', ++ '-fno-rtti', ++ '-fno-strict-aliasing' ++ ], ++ }], + ['OS=="mac"', { + 'defines': ['_DARWIN_USE_64_BIT_INODE=1'], + 'xcode_settings': { +@@ -436,7 +451,6 @@ + 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti + 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings + 'PREBINDING': 'NO', # No -Wl,-prebind +- 'MACOSX_DEPLOYMENT_TARGET': '10.10', # -mmacosx-version-min=10.10 + 'USE_HEADERMAP': 'NO', + 'OTHER_CFLAGS': [ + '-fno-strict-aliasing', +@@ -465,6 +479,9 @@ + ['target_arch=="x64"', { + 'xcode_settings': {'ARCHS': ['x86_64']}, + }], ++ [ 'target_arch=="arm64"', { ++ 'xcode_settings': {'ARCHS': ['arm64']}, ++ }], + ['clang==1', { + 'xcode_settings': { + 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', +diff -ur node-v12.3.1/configure.py node-v12.3.1+iPhone/configure.py +--- node-v12.3.1/configure.py 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/configure.py 2019-05-24 23:00:22.300728306 +0000 +@@ -44,7 +44,7 @@ + parser = optparse.OptionParser() + + valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', +- 'android', 'aix', 'cloudabi') ++ 'ios', 'android', 'aix', 'cloudabi') + valid_arch = ('arm', 'arm64', 'ia32', 'ppc', + 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390', 's390x') + valid_arm_float_abi = ('soft', 'softfp', 'hard') +@@ -908,6 +908,8 @@ + def configure_node(o): + if options.dest_os == 'android': + o['variables']['OS'] = 'android' ++ if options.dest_os == 'ios': ++ o['variables']['OS'] = 'ios' + o['variables']['node_prefix'] = options.prefix + o['variables']['node_install_npm'] = b(not options.without_npm) + o['variables']['node_report'] = b(not options.without_report) +@@ -1069,12 +1071,7 @@ + o['variables']['node_shared'] = b(options.shared) + node_module_version = getmoduleversion.get_version() + +- if sys.platform == 'darwin': +- shlib_suffix = '%s.dylib' +- elif sys.platform.startswith('aix'): +- shlib_suffix = '%s.a' +- else: +- shlib_suffix = 'so.%s' ++ shlib_suffix = '%s.dylib' + + shlib_suffix %= node_module_version + o['variables']['node_module_version'] = int(node_module_version) +diff -ur node-v12.3.1/deps/brotli/brotli.gyp node-v12.3.1+iPhone/deps/brotli/brotli.gyp +--- node-v12.3.1/deps/brotli/brotli.gyp 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/brotli/brotli.gyp 2019-05-24 23:00:22.300728306 +0000 +@@ -15,7 +15,7 @@ + 'OS_FREEBSD' + ] + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'defines': [ + 'OS_MACOSX' + ] +diff -ur node-v12.3.1/deps/cares/cares.gyp node-v12.3.1+iPhone/deps/cares/cares.gyp +--- node-v12.3.1/deps/cares/cares.gyp 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/cares/cares.gyp 2019-05-24 23:00:22.300728306 +0000 +@@ -145,7 +145,7 @@ + 'include_dirs': [ 'config/linux' ], + 'sources': [ 'config/linux/ares_config.h' ] + }], +- [ 'OS=="mac"', { ++ [ 'OS=="mac" or OS=="ios"', { + 'include_dirs': [ 'config/darwin' ], + 'sources': [ 'config/darwin/ares_config.h' ] + }], +diff -ur node-v12.3.1/deps/npm/node_modules/node-gyp/addon.gypi node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/addon.gypi +--- node-v12.3.1/deps/npm/node_modules/node-gyp/addon.gypi 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/addon.gypi 2019-05-24 23:00:22.304728309 +0000 +@@ -79,7 +79,7 @@ + ], + + 'conditions': [ +- [ 'OS=="mac"', { ++ [ 'OS=="mac" or OS=="ios"', { + 'defines': [ + '_DARWIN_USE_64_BIT_INODE=1' + ], +diff -ur node-v12.3.1/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp +--- node-v12.3.1/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-05-22 12:21:51.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2019-05-24 23:00:22.304728309 +0000 +@@ -545,12 +545,12 @@ + 'base/simd/scale_yuv_to_rgb_sse2_x64.asm', + ], + }], +- [ 'os_posix == 1 and OS != "mac" and OS != "android"', { ++ [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { + 'cflags': [ + '-msse2', + ], + }], +- [ 'OS == "mac"', { ++ [ 'OS == "mac" or OS == "ios"', { + 'configurations': { + 'Debug': { + 'xcode_settings': { +@@ -572,7 +572,7 @@ + ], + }, + }], +- [ 'OS=="mac"', { ++ [ 'OS=="mac" or OS=="ios"', { + 'variables': { + 'yasm_flags': [ + '-DPREFIX', +@@ -582,7 +582,7 @@ + ], + }, + }], +- [ 'os_posix==1 and OS!="mac"', { ++ [ 'os_posix==1 and OS!="mac" and OS!="ios"', { + 'variables': { + 'conditions': [ + [ 'target_arch=="ia32"', { +@@ -710,7 +710,7 @@ + 'webm/webm_parser_unittest.cc', + ], + 'conditions': [ +- ['os_posix==1 and OS!="mac"', { ++ ['os_posix==1 and OS!="mac" and OS!="ios"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ +@@ -930,7 +930,7 @@ + }, + ], + }], +- ['os_posix == 1 and OS != "mac" and OS != "android"', { ++ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { + 'targets': [ + { + 'target_name': 'player_x11', +@@ -1064,7 +1064,7 @@ + 'filters/pipeline_integration_test_base.cc', + ], + 'conditions': [ +- ['os_posix==1 and OS!="mac"', { ++ ['os_posix==1 and OS!="mac" and OS!="ios"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ +diff -ur node-v12.3.1/deps/uv/common.gypi node-v12.3.1+iPhone/deps/uv/common.gypi +--- node-v12.3.1/deps/uv/common.gypi 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/uv/common.gypi 2019-05-24 23:00:22.304728309 +0000 +@@ -168,6 +168,13 @@ + }], + ], + }], ++ ['OS=="ios"', { ++ 'cflags': [ ++ '-fno-exceptions', ++ '-fno-rtti', ++ '-fno-threadsafe-statics' ++ ], ++ }], + ['OS=="mac"', { + 'xcode_settings': { + 'ALWAYS_SEARCH_USER_PATHS': 'NO', +diff -ur node-v12.3.1/deps/uv/uv.gyp node-v12.3.1+iPhone/deps/uv/uv.gyp +--- node-v12.3.1/deps/uv/uv.gyp 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/uv/uv.gyp 2019-05-24 23:00:22.304728309 +0000 +@@ -198,7 +198,7 @@ + }], + ], + }], +- ['uv_library=="shared_library" and OS!="mac" and OS!="zos"', { ++ ['uv_library=="shared_library" and OS!="mac" and OS!="ios" and OS!="zos"', { + # This will cause gyp to set soname + # Must correspond with UV_VERSION_MAJOR + # in include/uv/version.h +diff -ur node-v12.3.1/node.gyp node-v12.3.1+iPhone/node.gyp +--- node-v12.3.1/node.gyp 2019-05-22 12:21:54.000000000 +0000 ++++ node-v12.3.1+iPhone/node.gyp 2019-05-24 23:00:22.304728309 +0000 +@@ -760,7 +760,7 @@ + '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o' + ], + }], +- [ 'OS!="mac" and OS!="linux"', { ++ [ 'OS!="mac" and OS!="ios" and OS!="linux"', { + 'sources': [ + 'src/node_dtrace_ustack.cc', + 'src/node_dtrace_provider.cc', +@@ -939,7 +939,7 @@ + 'target_name': 'node_dtrace_provider', + 'type': 'none', + 'conditions': [ +- [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', { ++ [ 'node_use_dtrace=="true" and OS!="mac" and OS!="ios" and OS!="linux"', { + 'actions': [ + { + 'action_name': 'node_dtrace_provider_o', +@@ -974,7 +974,7 @@ + 'target_name': 'node_dtrace_ustack', + 'type': 'none', + 'conditions': [ +- [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', { ++ [ 'node_use_dtrace=="true" and OS!="mac" and OS!="ios" and OS!="linux"', { + 'actions': [ + { + 'action_name': 'node_dtrace_ustack_constants', +diff -ur node-v12.3.1/node.gypi node-v12.3.1+iPhone/node.gypi +--- node-v12.3.1/node.gypi 2019-05-22 12:21:54.000000000 +0000 ++++ node-v12.3.1+iPhone/node.gypi 2019-05-24 23:01:07.844752503 +0000 +@@ -141,7 +141,7 @@ + }, + }, + 'conditions': [ +- ['OS!="aix" and node_shared=="false"', { ++ ['OS!="aix" and OS!="ios" and node_shared=="false"', { + 'ldflags': [ + '-Wl,--whole-archive,' + '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', +@@ -182,7 +182,7 @@ + }, + }, + 'conditions': [ +- ['OS!="aix" and node_shared=="false"', { ++ ['OS!="aix" and OS!="ios" and node_shared=="false"', { + 'ldflags': [ + '-Wl,--whole-archive,' + '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', +@@ -202,7 +202,7 @@ + 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], + }], + +- [ 'OS=="mac"', { ++ [ 'OS=="mac" or OS=="ios"', { + # linking Corefoundation is needed since certain OSX debugging tools + # like Instruments require it for some features + 'libraries': [ '-framework CoreFoundation' ], +diff -ur node-v12.3.1/tools/v8_gypfiles/d8.gyp node-v12.3.1+iPhone/tools/v8_gypfiles/d8.gyp +--- node-v12.3.1/tools/v8_gypfiles/d8.gyp 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/d8.gyp 2019-05-24 23:00:22.308728311 +0000 +@@ -43,7 +43,7 @@ + 'd8_js2c#host', + ], + }], +- ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \ ++ ['(OS=="linux" or OS=="mac" or OS=="ios" or OS=="freebsd" or OS=="netbsd" \ + or OS=="openbsd" or OS=="solaris" or OS=="android" \ + or OS=="qnx" or OS=="aix")', { + 'sources': [ '../src/d8-posix.cc', ] +diff -ur node-v12.3.1/tools/v8_gypfiles/v8.gyp node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp +--- node-v12.3.1/tools/v8_gypfiles/v8.gyp 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-24 23:00:22.308728311 +0000 +@@ -128,6 +128,12 @@ + 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load'] + }, + }], ++ ['OS=="ios"', { ++ 'ldflags': [ ++ '-dynamiclib', ++ '-all_load' ++ ], ++ }], + ['soname_version!=""', { + 'product_extension': 'so.<(soname_version)', + }], diff --git a/data/node/gyp.diff b/data/node/gyp.diff index 9bef5e88c..bf41b1113 100644 --- a/data/node/gyp.diff +++ b/data/node/gyp.diff @@ -29,14 +29,6 @@ diff -ur node-v12.2.0/tools/gyp/pylib/gyp/generator/make.py node-v12.2.0+iPhone/ quiet_cmd_link = LINK($(TOOLSET)) $@ cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS) -@@ -502,7 +519,6 @@ - cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@" - """ - -- - def WriteRootHeaderSuffixRules(writer): - extensions = sorted(COMPILABLE_EXTENSIONS.keys(), key=str.lower) - @@ -2033,41 +2049,9 @@ 'srcdir': srcdir, 'copy_archive_args': copy_archive_arguments, diff --git a/data/node/make.sh b/data/node/make.sh index 3f0521b48..91dc4fe9a 100644 --- a/data/node/make.sh +++ b/data/node/make.sh @@ -19,8 +19,13 @@ export CXX_target="${CXX}" export LINK_target="${CXX}" # On purpose, see out/Makefile export AR_target="${AR}" -export GYP_CROSSCOMPILE=1 -export GYP_DEFINES="target_arch=arm64 v8_target_arch=arm64 host_os=linux target_os=ios OS=ios" -./configure --without-snapshot --shared --dest-os=ios --dest-cpu=arm64 --with-intl=none --shared-zlib --shared-cares --shared-openssl # --openssl-no-asm -make +GYP_CROSSCOMPILE=1 \ +GYP_DEFINES="v8_enable_inspector=1 target_arch=arm64 v8_target_arch=arm64 host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')" \ +./configure --prefix="${PKG_TAPF}" --without-snapshot --cross-compiling --dest-os=ios --dest-cpu=arm64 --without-intl --without-npm --shared-zlib --shared-cares --shared-openssl --enable-static # --openssl-no-asm --shared + +# TODO: Fix tool/install.py and the Makefile +make -j2 +make install DESTDIR="${PKG_DEST}" + +cp Release/node ${PKG_DEST}/usr/bin || : diff --git a/data/node/node-v12.2.0.tar.gz b/data/node/node-v12.2.0.tar.gz deleted file mode 100644 index f69e30c07..000000000 Binary files a/data/node/node-v12.2.0.tar.gz and /dev/null differ diff --git a/data/node/node-v12.3.1.tar.gz b/data/node/node-v12.3.1.tar.gz new file mode 100644 index 000000000..7c8799095 Binary files /dev/null and b/data/node/node-v12.3.1.tar.gz differ diff --git a/data/node/v8.diff b/data/node/v8.diff index 7ed407a0e..aed571fa6 100644 --- a/data/node/v8.diff +++ b/data/node/v8.diff @@ -1,6 +1,30 @@ -diff -ur node-v12.2.0/tools/v8_gypfiles/toolchain.gypi node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi ---- node-v12.2.0/tools/v8_gypfiles/toolchain.gypi 2019-05-07 14:52:17.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi 2019-05-23 17:52:51.039689961 +0000 +diff -ur node-v12.3.1/deps/v8/src/arm64/cpu-arm64.cc node-v12.3.1+iPhone/deps/v8/src/arm64/cpu-arm64.cc +--- node-v12.3.1/deps/v8/src/arm64/cpu-arm64.cc 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/v8/src/arm64/cpu-arm64.cc 2019-05-24 19:37:47.406732128 +0000 +@@ -15,7 +15,7 @@ + class CacheLineSizes { + public: + CacheLineSizes() { +-#if !defined(V8_HOST_ARCH_ARM64) || defined(V8_OS_WIN) ++#if !defined(V8_HOST_ARCH_ARM64) || defined(V8_OS_WIN) || defined(V8_OS_IPHONEOS) || defined(__IPHONEOS__) + cache_type_register_ = 0; + #else + // Copy the content of the cache type register to a core register. +diff -ur node-v12.3.1/deps/v8/src/base/platform/platform-posix.cc node-v12.3.1+iPhone/deps/v8/src/base/platform/platform-posix.cc +--- node-v12.3.1/deps/v8/src/base/platform/platform-posix.cc 2019-05-22 12:21:52.000000000 +0000 ++++ node-v12.3.1+iPhone/deps/v8/src/base/platform/platform-posix.cc 2019-05-24 19:40:15.582804009 +0000 +@@ -240,6 +240,8 @@ + // 42 bits of virtual addressing. Truncate to 40 bits to allow kernel chance + // to fulfill request. + raw_addr &= uint64_t{0xFFFFFF0000}; ++#elif V8_TARGET_ARCH_ARM64 ++ raw_addr = raw_addr >> 14 << 14; + #else + raw_addr &= 0x3FFFF000; + +diff -ur node-v12.3.1/tools/v8_gypfiles/toolchain.gypi node-v12.3.1+iPhone/tools/v8_gypfiles/toolchain.gypi +--- node-v12.3.1/tools/v8_gypfiles/toolchain.gypi 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/toolchain.gypi 2019-05-24 19:35:58.206678803 +0000 @@ -84,7 +84,9 @@ # The setting is ignored if want_separate_host_toolset is 0. 'v8_toolset_for_shell%': 'target', @@ -75,28 +99,23 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/toolchain.gypi node-v12.2.0+iPhone/tools 'xcode_settings': { 'GCC_OPTIMIZATION_LEVEL': '3', # -O3 -diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp ---- node-v12.2.0/tools/v8_gypfiles/v8.gyp 2019-05-07 14:52:17.000000000 +0000 -+++ node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-23 17:57:07.199852911 +0000 -@@ -123,7 +123,7 @@ +diff -ur node-v12.3.1/tools/v8_gypfiles/v8.gyp node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp +--- node-v12.3.1/tools/v8_gypfiles/v8.gyp 2019-05-22 12:21:55.000000000 +0000 ++++ node-v12.3.1+iPhone/tools/v8_gypfiles/v8.gyp 2019-05-24 19:45:01.650941667 +0000 +@@ -123,6 +123,12 @@ ], }, 'conditions': [ -- ['OS=="mac"', { -+ ['OS=="mac" or OS=="ios"', { ++ ['OS=="ios"', { ++ 'ldflags': [ ++ '-dynamiclib', ++ '-all_load' ++ ], ++ }], + ['OS=="mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load'] - }, -@@ -1824,7 +1824,7 @@ - '<(V8_ROOT)/src/x64/sse-instr.h', - ], - }], -- ['v8_target_arch=="x64" and (OS=="linux" or OS=="mac")', { -+ ['v8_target_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="ios")', { - 'sources': [ - '<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc', - '<(V8_ROOT)/src/trap-handler/handler-inside-posix.h', -@@ -2221,7 +2221,7 @@ +@@ -2221,7 +2227,7 @@ }], ], 'conditions': [ @@ -105,7 +124,7 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypf 'link_settings': { 'libraries': [ '-ldl', -@@ -2296,15 +2296,38 @@ +@@ -2296,15 +2302,37 @@ '<(V8_ROOT)/src/base/platform/platform-fuchsia.cc', ]}, ], @@ -134,7 +153,6 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypf + 'link_settings': { + 'target_conditions': [ + ['_toolset=="host" and host_os!="mac"', { -+ + 'libraries': [ + '-ldl', + '-lpthread', -- cgit v1.2.3