diff options
Diffstat (limited to 'data/nodejs/configure-ios.diff')
| -rw-r--r-- | data/nodejs/configure-ios.diff | 210 |
1 files changed, 97 insertions, 113 deletions
diff --git a/data/nodejs/configure-ios.diff b/data/nodejs/configure-ios.diff index 053234802..a28a532de 100644 --- a/data/nodejs/configure-ios.diff +++ b/data/nodejs/configure-ios.diff @@ -1,16 +1,25 @@ -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, - }], -- ['OS == "mac"', { -+ ['OS == "mac" or OS=="ios"', { - 'obj_dir%': '<(PRODUCT_DIR)/obj.target', - 'v8_base': '<(PRODUCT_DIR)/libv8_base.a', - }], -@@ -104,7 +104,7 @@ +diff -Naur node-v12.17.0/common.gypi node-v12.17.0+iPhone/common.gypi +--- node-v12.17.0/common.gypi 2020-05-26 04:53:30.000000000 -0700 ++++ node-v12.17.0+iPhone/common.gypi 2020-05-27 19:35:19.000000000 -0700 +@@ -100,7 +100,7 @@ + 'obj_dir': '<(PRODUCT_DIR)/obj', + 'v8_base': '<(PRODUCT_DIR)/lib/libv8_snapshot.a', + }], +- ['OS == "mac"', { ++ ['OS == "mac" or OS == "ios"', { + 'obj_dir%': '<(PRODUCT_DIR)/obj.target', + 'v8_base': '<(PRODUCT_DIR)/libv8_snapshot.a', + }], +@@ -118,7 +118,7 @@ + 'obj_dir': '<(PRODUCT_DIR)/obj', + 'v8_base': '<(PRODUCT_DIR)/lib/libv8_nosnapshot.a', + }], +- ['OS == "mac"', { ++ ['OS == "mac" or OS == "ios"', { + 'obj_dir%': '<(PRODUCT_DIR)/obj.target', + 'v8_base': '<(PRODUCT_DIR)/libv8_nosnapshot.a', + }], +@@ -129,7 +129,7 @@ }, { 'openssl_product': '<(STATIC_LIB_PREFIX)openssl<(STATIC_LIB_SUFFIX)', }], @@ -18,8 +27,8 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi + ['OS=="mac" or OS=="ios"', { 'clang%': 1, }], - ], -@@ -172,7 +172,7 @@ + ['target_arch in "ppc64 s390x"', { +@@ -200,7 +200,7 @@ # pull in V8's postmortem metadata 'ldflags': [ '-Wl,-z,allextract' ] }], @@ -28,7 +37,7 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi 'cflags': [ '-fno-omit-frame-pointer' ], }], ['OS=="linux"', { -@@ -293,7 +293,7 @@ +@@ -314,7 +314,7 @@ [ 'target_arch=="arm64"', { 'msvs_configuration_platform': 'arm64', }], @@ -37,7 +46,7 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi 'cflags+': [ '-fno-omit-frame-pointer', '-fsanitize=address', -@@ -302,7 +302,7 @@ +@@ -324,7 +324,7 @@ 'cflags!': [ '-fomit-frame-pointer' ], 'ldflags': [ '-fsanitize=address' ], }], @@ -46,7 +55,7 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi 'xcode_settings': { 'OTHER_CFLAGS+': [ '-fno-omit-frame-pointer', -@@ -425,6 +425,21 @@ +@@ -457,6 +457,21 @@ }], ], }], @@ -68,7 +77,7 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi ['OS=="mac"', { 'defines': ['_DARWIN_USE_64_BIT_INODE=1'], 'xcode_settings': { -@@ -436,7 +451,6 @@ +@@ -468,7 +483,6 @@ 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings 'PREBINDING': 'NO', # No -Wl,-prebind @@ -76,7 +85,7 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi 'USE_HEADERMAP': 'NO', 'OTHER_CFLAGS': [ '-fno-strict-aliasing', -@@ -465,6 +479,9 @@ +@@ -497,6 +511,9 @@ ['target_arch=="x64"', { 'xcode_settings': {'ARCHS': ['x86_64']}, }], @@ -86,19 +95,19 @@ diff -ur node-v12.3.1/common.gypi node-v12.3.1+iPhone/common.gypi ['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-25 00:16:01.809813352 +0000 -@@ -44,7 +44,7 @@ +diff -Naur node-v12.17.0/configure.py node-v12.17.0+iPhone/configure.py +--- node-v12.17.0/configure.py 2020-05-26 04:53:30.000000000 -0700 ++++ node-v12.17.0+iPhone/configure.py 2020-05-27 19:37:54.000000000 -0700 +@@ -46,7 +46,7 @@ + # parse our options 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 @@ +-valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', ++valid_os = ('win', 'ios', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', + 'android', 'aix', 'cloudabi') + valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', + 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390x') +@@ -1008,6 +1008,8 @@ def configure_node(o): if options.dest_os == 'android': o['variables']['OS'] = 'android' @@ -106,24 +115,19 @@ diff -ur node-v12.3.1/configure.py node-v12.3.1+iPhone/configure.py + 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' + o['variables']['debug_node'] = b(options.debug_node) +@@ -1157,7 +1159,7 @@ - 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-25 00:16:01.809813352 +0000 + if options.dest_os == 'android': + shlib_suffix = 'so' +- elif sys.platform == 'darwin': ++ elif sys.platform == 'darwin' or True: + shlib_suffix = '%s.dylib' + elif sys.platform.startswith('aix'): + shlib_suffix = '%s.a' +diff -Naur node-v12.17.0/deps/brotli/brotli.gyp node-v12.17.0+iPhone/deps/brotli/brotli.gyp +--- node-v12.17.0/deps/brotli/brotli.gyp 2020-05-26 04:53:30.000000000 -0700 ++++ node-v12.17.0+iPhone/deps/brotli/brotli.gyp 2020-05-27 19:25:53.000000000 -0700 @@ -15,7 +15,7 @@ 'OS_FREEBSD' ] @@ -133,10 +137,10 @@ diff -ur node-v12.3.1/deps/brotli/brotli.gyp node-v12.3.1+iPhone/deps/brotli/bro '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-25 00:16:01.813813354 +0000 -@@ -145,7 +145,7 @@ +diff -Naur node-v12.17.0/deps/cares/cares.gyp node-v12.17.0+iPhone/deps/cares/cares.gyp +--- node-v12.17.0/deps/cares/cares.gyp 2020-05-26 04:53:30.000000000 -0700 ++++ node-v12.17.0+iPhone/deps/cares/cares.gyp 2020-05-27 19:25:53.000000000 -0700 +@@ -153,7 +153,7 @@ 'include_dirs': [ 'config/linux' ], 'sources': [ 'config/linux/ares_config.h' ] }], @@ -145,10 +149,10 @@ diff -ur node-v12.3.1/deps/cares/cares.gyp node-v12.3.1+iPhone/deps/cares/cares. '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-25 00:16:01.813813354 +0000 -@@ -79,7 +79,7 @@ +diff -Naur node-v12.17.0/deps/npm/node_modules/node-gyp/addon.gypi node-v12.17.0+iPhone/deps/npm/node_modules/node-gyp/addon.gypi +--- node-v12.17.0/deps/npm/node_modules/node-gyp/addon.gypi 2020-05-26 04:53:30.000000000 -0700 ++++ node-v12.17.0+iPhone/deps/npm/node_modules/node-gyp/addon.gypi 2020-05-27 19:25:53.000000000 -0700 +@@ -89,7 +89,7 @@ ], 'conditions': [ @@ -157,9 +161,9 @@ diff -ur node-v12.3.1/deps/npm/node_modules/node-gyp/addon.gypi node-v12.3.1+iPh '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-25 00:16:01.813813354 +0000 +diff -Naur node-v12.17.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp node-v12.17.0+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp +--- node-v12.17.0/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2020-05-26 04:53:30.000000000 -0700 ++++ node-v12.17.0+iPhone/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/media.gyp 2020-05-27 19:25:53.000000000 -0700 @@ -545,12 +545,12 @@ 'base/simd/scale_yuv_to_rgb_sse2_x64.asm', ], @@ -220,10 +224,10 @@ diff -ur node-v12.3.1/deps/npm/node_modules/node-gyp/gyp/tools/emacs/testdata/me '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-25 00:16:01.813813354 +0000 -@@ -168,6 +168,13 @@ +diff -Naur node-v12.17.0/deps/uv/common.gypi node-v12.17.0+iPhone/deps/uv/common.gypi +--- node-v12.17.0/deps/uv/common.gypi 2020-05-26 04:53:32.000000000 -0700 ++++ node-v12.17.0+iPhone/deps/uv/common.gypi 2020-05-27 19:25:53.000000000 -0700 +@@ -169,6 +169,13 @@ }], ], }], @@ -237,10 +241,10 @@ diff -ur node-v12.3.1/deps/uv/common.gypi node-v12.3.1+iPhone/deps/uv/common.gyp ['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-25 00:16:01.813813354 +0000 -@@ -198,7 +198,7 @@ +diff -Naur node-v12.17.0/deps/uv/uv.gyp node-v12.17.0+iPhone/deps/uv/uv.gyp +--- node-v12.17.0/deps/uv/uv.gyp 2020-05-26 04:53:32.000000000 -0700 ++++ node-v12.17.0+iPhone/deps/uv/uv.gyp 2020-05-27 19:25:53.000000000 -0700 +@@ -201,7 +201,7 @@ }], ], }], @@ -249,30 +253,10 @@ diff -ur node-v12.3.1/deps/uv/uv.gyp node-v12.3.1+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.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 @@ +diff -Naur node-v12.17.0/node.gyp node-v12.17.0+iPhone/node.gyp +--- node-v12.17.0/node.gyp 2020-05-26 04:53:34.000000000 -0700 ++++ node-v12.17.0+iPhone/node.gyp 2020-05-27 19:25:53.000000000 -0700 +@@ -845,7 +845,7 @@ '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o' ], }], @@ -281,7 +265,7 @@ diff -ur node-v12.3.1/node.gyp node-v12.3.1+iPhone/node.gyp 'sources': [ 'src/node_dtrace_ustack.cc', 'src/node_dtrace_provider.cc', -@@ -939,7 +938,7 @@ +@@ -993,7 +993,7 @@ 'target_name': 'node_dtrace_provider', 'type': 'none', 'conditions': [ @@ -290,7 +274,7 @@ diff -ur node-v12.3.1/node.gyp node-v12.3.1+iPhone/node.gyp 'actions': [ { 'action_name': 'node_dtrace_provider_o', -@@ -974,7 +973,7 @@ +@@ -1028,7 +1028,7 @@ 'target_name': 'node_dtrace_ustack', 'type': 'none', 'conditions': [ @@ -299,32 +283,32 @@ diff -ur node-v12.3.1/node.gyp node-v12.3.1+iPhone/node.gyp '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-25 12:03:43.012932500 +0000 -@@ -143,9 +143,8 @@ +diff -Naur node-v12.17.0/node.gypi node-v12.17.0+iPhone/node.gypi +--- node-v12.17.0/node.gypi 2020-05-26 04:53:34.000000000 -0700 ++++ node-v12.17.0+iPhone/node.gypi 2020-05-27 19:43:41.000000000 -0700 +@@ -134,9 +134,7 @@ '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,--whole-archive', +- '<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', - '-Wl,--no-whole-archive', ++ '-Wl,-force_load,<(obj_dir)/deps/zlib/<(STATIC_LIB_PREFIX)zlib<(STATIC_LIB_SUFFIX)', ], }], ], -@@ -184,9 +183,8 @@ +@@ -174,9 +172,7 @@ '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,--whole-archive', +- '<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', - '-Wl,--no-whole-archive', ++ '-Wl,-force_load,<(obj_dir)/deps/uv/<(STATIC_LIB_PREFIX)uv<(STATIC_LIB_SUFFIX)', ], }], ], -@@ -202,7 +200,7 @@ +@@ -192,7 +188,7 @@ 'dependencies': [ 'deps/brotli/brotli.gyp:brotli' ], }], @@ -333,9 +317,9 @@ diff -ur node-v12.3.1/node.gypi node-v12.3.1+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.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 +diff -Naur node-v12.17.0/tools/v8_gypfiles/d8.gyp node-v12.17.0+iPhone/tools/v8_gypfiles/d8.gyp +--- node-v12.17.0/tools/v8_gypfiles/d8.gyp 2020-05-26 04:53:35.000000000 -0700 ++++ node-v12.17.0+iPhone/tools/v8_gypfiles/d8.gyp 2020-05-27 19:25:53.000000000 -0700 @@ -43,7 +43,7 @@ 'd8_js2c#host', ], @@ -344,11 +328,11 @@ diff -ur node-v12.3.1/tools/v8_gypfiles/d8.gyp node-v12.3.1+iPhone/tools/v8_gypf + ['(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-25 00:16:01.817813355 +0000 -@@ -128,6 +128,12 @@ + 'sources': [ '<(V8_ROOT)/src/d8/d8-posix.cc', ] +diff -Naur node-v12.17.0/tools/v8_gypfiles/v8.gyp node-v12.17.0+iPhone/tools/v8_gypfiles/v8.gyp +--- node-v12.17.0/tools/v8_gypfiles/v8.gyp 2020-05-26 04:53:35.000000000 -0700 ++++ node-v12.17.0+iPhone/tools/v8_gypfiles/v8.gyp 2020-05-27 19:25:53.000000000 -0700 +@@ -1442,6 +1442,12 @@ 'OTHER_LDFLAGS': ['-dynamiclib', '-all_load'] }, }], |