diff options
Diffstat (limited to 'data/node/configure-ios.diff')
| -rw-r--r-- | data/node/configure-ios.diff | 161 |
1 files changed, 95 insertions, 66 deletions
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'] }, |