diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-04-01 19:41:32 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-04-03 16:12:55 +0200 |
commit | 0647cb311e4b5e25dbdcdf227bc7a455cc6dce2d (patch) | |
tree | a255d3d552e1ca807a8ff871f27719022a40cdf8 /deps/node | |
parent | 71e285b94c7edaa43aa8115965cf5a36b8e0f80a (diff) | |
download | akono-0647cb311e4b5e25dbdcdf227bc7a455cc6dce2d.tar.gz akono-0647cb311e4b5e25dbdcdf227bc7a455cc6dce2d.tar.bz2 akono-0647cb311e4b5e25dbdcdf227bc7a455cc6dce2d.zip |
build script and patches
Diffstat (limited to 'deps/node')
-rw-r--r-- | deps/node/common.gypi | 8 | ||||
-rw-r--r-- | deps/node/deps/cares/config/android/ares_config.h | 2 | ||||
-rw-r--r-- | deps/node/deps/openssl/openssl-cl_no_asm.gypi | 2 | ||||
-rw-r--r-- | deps/node/deps/openssl/openssl_no_asm.gypi | 2 | ||||
-rw-r--r-- | deps/node/node.gyp | 4 | ||||
-rw-r--r-- | deps/node/node.gypi | 3 |
6 files changed, 14 insertions, 7 deletions
diff --git a/deps/node/common.gypi b/deps/node/common.gypi index 338ed2cb..36a773a4 100644 --- a/deps/node/common.gypi +++ b/deps/node/common.gypi @@ -123,8 +123,8 @@ 'ldflags': [ '-Wl,-bbigtoc' ], }], ['OS == "android"', { - 'cflags': [ '-fPIE' ], - 'ldflags': [ '-fPIE', '-pie' ] + 'cflags': [ '-fPIC' ], + 'ldflags': [ '-fPIC' ] }], ['node_shared=="true"', { 'msvs_settings': { @@ -198,8 +198,8 @@ ], },], ['OS == "android"', { - 'cflags': [ '-fPIE' ], - 'ldflags': [ '-fPIE', '-pie' ] + 'cflags': [ '-fPIC' ], + 'ldflags': [ '-fPIC' ] }], ['node_shared=="true"', { 'msvs_settings': { diff --git a/deps/node/deps/cares/config/android/ares_config.h b/deps/node/deps/cares/config/android/ares_config.h index 1a5265a5..2d469d5c 100644 --- a/deps/node/deps/cares/config/android/ares_config.h +++ b/deps/node/deps/cares/config/android/ares_config.h @@ -128,7 +128,7 @@ #define HAVE_GETNAMEINFO 1 /* Define to 1 if you have the getservbyport_r function. */ -#define HAVE_GETSERVBYPORT_R 1 +#undef HAVE_GETSERVBYPORT_R /* Define to 1 if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 diff --git a/deps/node/deps/openssl/openssl-cl_no_asm.gypi b/deps/node/deps/openssl/openssl-cl_no_asm.gypi index 8b44e1f6..dff1146b 100644 --- a/deps/node/deps/openssl/openssl-cl_no_asm.gypi +++ b/deps/node/deps/openssl/openssl-cl_no_asm.gypi @@ -16,6 +16,8 @@ 'includes': ['config/archs/linux64-s390x/no-asm/openssl-cl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { 'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'], + }, 'target_arch=="arm" and OS=="android"', { + 'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'], }, 'target_arch=="arm64" and OS=="linux"', { 'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'], }, 'target_arch=="ia32" and OS=="linux"', { diff --git a/deps/node/deps/openssl/openssl_no_asm.gypi b/deps/node/deps/openssl/openssl_no_asm.gypi index 2e0d9639..080577c5 100644 --- a/deps/node/deps/openssl/openssl_no_asm.gypi +++ b/deps/node/deps/openssl/openssl_no_asm.gypi @@ -17,6 +17,8 @@ 'includes': ['config/archs/linux64-s390x/no-asm/openssl.gypi'], }, 'target_arch=="arm" and OS=="linux"', { 'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'], + }, 'target_arch=="arm" and OS=="android"', { + 'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'], }, 'target_arch=="arm64" and OS=="linux"', { 'includes': ['config/archs/linux-aarch64/no-asm/openssl.gypi'], }, 'target_arch=="ia32" and OS=="linux"', { diff --git a/deps/node/node.gyp b/deps/node/node.gyp index 6bd2e63a..61d232cd 100644 --- a/deps/node/node.gyp +++ b/deps/node/node.gyp @@ -362,7 +362,8 @@ 'include_dirs': [ 'src', - '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h + '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h + 'deps/v8/include/' ], 'dependencies': [ 'deps/histogram/histogram.gyp:histogram' ], @@ -991,7 +992,6 @@ 'deps/uv/include', '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h ], - 'defines': [ 'NODE_WANT_INTERNALS=1' ], 'sources': [ diff --git a/deps/node/node.gypi b/deps/node/node.gypi index c07b5ea7..5721a375 100644 --- a/deps/node/node.gypi +++ b/deps/node/node.gypi @@ -84,6 +84,9 @@ }], ], }], + [ 'node_use_bundled_v8=="false"', { + 'libraries' : [ '<!(pwd)/deps/v8/out.gn/arm.release/obj/libv8_monolith.a' ], + }], [ 'node_use_v8_platform=="true"', { 'defines': [ 'NODE_USE_V8_PLATFORM=1', |