diff options
Diffstat (limited to 'data/node/configure-ios.diff')
| -rw-r--r-- | data/node/configure-ios.diff | 409 |
1 files changed, 409 insertions, 0 deletions
diff --git a/data/node/configure-ios.diff b/data/node/configure-ios.diff new file mode 100644 index 000000000..6931ec2b0 --- /dev/null +++ b/data/node/configure-ios.diff @@ -0,0 +1,409 @@ +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-21 16:27:29.881915067 +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,7 +425,7 @@ + }], + ], + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'defines': ['_DARWIN_USE_64_BIT_INODE=1'], + 'xcode_settings': { + 'ALWAYS_SEARCH_USER_PATHS': 'NO', +@@ -436,7 +436,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 +464,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.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-21 17:16:40.220236939 +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) +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-21 16:39:13.646278959 +0000 +@@ -15,7 +15,7 @@ + 'OS_FREEBSD' + ] + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + '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-21 16:35:48.518195450 +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.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-21 16:39:50.534292795 +0000 +@@ -79,7 +79,7 @@ + ], + + 'conditions': [ +- [ 'OS=="mac"', { ++ [ 'OS=="mac" or OS=="ios"', { + '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-21 17:12:33.672092688 +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.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-21 16:42:57.890362407 +0000 +@@ -168,7 +168,7 @@ + }], + ], + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'xcode_settings': { + 'ALWAYS_SEARCH_USER_PATHS': 'NO', + 'GCC_CW_ASM_SYNTAX': 'NO', # No -fasm-blocks +@@ -195,6 +195,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-21 16:43:40.962449173 +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.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-21 16:51:35.455143755 +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', +@@ -938,7 +938,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', +@@ -973,7 +973,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.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-21 16:51:57.859168216 +0000 +@@ -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.2.0/tools/v8_gypfiles/broken/standalone.gypi node-v12.2.0+iPhone/tools/v8_gypfiles/broken/standalone.gypi +--- node-v12.2.0/tools/v8_gypfiles/broken/standalone.gypi 2019-05-07 14:52:17.000000000 +0000 ++++ node-v12.2.0+iPhone/tools/v8_gypfiles/broken/standalone.gypi 2019-05-21 16:48:38.214928931 +0000 +@@ -53,7 +53,7 @@ + 'variables': { + 'conditions': [ + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or \ +- OS=="netbsd" or OS=="mac" or OS=="qnx" or OS=="aix"', { ++ OS=="netbsd" or OS=="mac" or OS=="ios" or OS=="qnx" or OS=="aix"', { + # This handles the Unix platforms we generally deal with. + # Anything else gets passed through, which probably won't work + # very well; such hosts should pass an explicit target_arch +@@ -519,7 +519,7 @@ + 'DEBUG', + ], + 'conditions': [ +- ['os_posix == 1 and OS != "mac"', { ++ ['os_posix == 1 and OS != "mac" and OS != "ios"', { + # We don't want to get warnings from third-party code, + # so remove any existing warning-enabling flags like -Wall. + 'cflags!': [ +@@ -550,7 +550,7 @@ + '-Wnon-virtual-dtor', + ], + }], +- ['OS == "mac"', { ++ ['OS == "mac" or OS == "ios"', { + 'xcode_settings': { + 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror + }, +@@ -567,7 +567,7 @@ + ], + }, + 'conditions': [ +- ['os_posix==1 and OS!="mac"', { ++ ['os_posix==1 and OS!="mac" and OS!="ios"', { + 'target_defaults': { + 'conditions': [ + # Common options for AddressSanitizer, LeakSanitizer, +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-21 16:50:27.615066264 +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.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-21 16:50:01.383034824 +0000 +@@ -371,7 +371,7 @@ + [ 'clang==1', { + 'cflags': ['-integrated-as'], + }], +- ['OS!="mac"', { ++ ['OS!="mac" and OS!="ios"', { + 'defines': ['_MIPS_TARGET_HW',], + }, { + 'defines': ['_MIPS_TARGET_SIMULATOR',], +@@ -384,7 +384,7 @@ + }], #'_toolset=="target" + ['_toolset=="host"', { + 'conditions': [ +- ['v8_target_arch==target_arch and OS!="mac"', { ++ ['v8_target_arch==target_arch and OS!="mac" and OS!="ios"', { + 'defines': ['_MIPS_TARGET_HW',], + }, { + 'defines': ['_MIPS_TARGET_SIMULATOR',], +@@ -1025,7 +1025,7 @@ + }, + }], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ +- or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ ++ or OS=="netbsd" or OS=="mac" or OS=="ios" or OS=="android" or OS=="qnx") and \ + v8_target_arch=="ia32"', { + 'cflags': [ + '-msse2', +@@ -1034,7 +1034,7 @@ + ], + }], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ +- or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ ++ or OS=="netbsd" or OS=="mac" or OS=="ios" or OS=="android" or OS=="qnx") and \ + (v8_target_arch=="arm" or v8_target_arch=="ia32" or \ + v8_target_arch=="mips" or v8_target_arch=="mipsel" or \ + v8_target_arch=="ppc" or v8_target_arch=="s390")', { +@@ -1235,7 +1235,7 @@ + '-ffunction-sections', + ], + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '0', # -O0 + }, +@@ -1296,7 +1296,7 @@ + }], + ], + }], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'xcode_settings': { + 'GCC_OPTIMIZATION_LEVEL': '3', # -O3 + 'GCC_STRICT_ALIASING': 'YES', +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-21 16:46:00.898697935 +0000 +@@ -123,7 +123,7 @@ + ], + }, + 'conditions': [ +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + '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', +@@ -2296,7 +2296,7 @@ + '<(V8_ROOT)/src/base/platform/platform-fuchsia.cc', + ]}, + ], +- ['OS=="mac"', { ++ ['OS=="mac" or OS=="ios"', { + 'sources': [ + '<(V8_ROOT)/src/base/debug/stack_trace_posix.cc', + '<(V8_ROOT)/src/base/platform/platform-macos.cc', |