diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-03-31 14:09:53 +0900 |
|---|---|---|
| committer | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-04-15 00:38:44 +0900 |
| commit | 418e839456e31356d96c75f0e63231affa2311aa (patch) | |
| tree | a2165e894925f744e7e058866d0348eb617e398f /deps/openssl/openssl.gyp | |
| parent | 02f12ab666a0bc9f4352c174ca0a8993e6a1ab2a (diff) | |
| download | android-node-v8-418e839456e31356d96c75f0e63231affa2311aa.tar.gz android-node-v8-418e839456e31356d96c75f0e63231affa2311aa.tar.bz2 android-node-v8-418e839456e31356d96c75f0e63231affa2311aa.zip | |
deps: update openssl.gyp/gypi for openssl-1.0.2a
Update gyp sources for openssl-1.0.2a. The source list was extracted
from Makefiles in `deps/openssl/openssl/{crypto/ssl/engines}`.
Defines are created by referring the table in
`deps/openssl/doc/openssl_define_list.pdf` that was derived from
Makefile entries and outputs of
`deps/openssl/openssl/Configure TABLE`.
Renamed the variable of openssl_sources_arm_elf_gas to
openssl_sources_arm_void_gas to be consistent with PERLASM_SCHEME.
This also includes arm64 support.
Fixes: https://github.com/iojs/io.js/issues/589
PR-URL: https://github.com/iojs/io.js/pull/1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl.gyp')
| -rw-r--r-- | deps/openssl/openssl.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 01ac2c5e05..6d8b10d690 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -30,7 +30,7 @@ 'conditions': [ ['target_arch=="arm"', { 'defines': ['<@(openssl_defines_asm)'], - 'sources': ['<@(openssl_sources_arm_elf_gas)'], + 'sources': ['<@(openssl_sources_arm_void_gas)'], }, 'target_arch=="ia32" and OS=="mac"', { 'defines': [ '<@(openssl_defines_asm)', @@ -69,6 +69,9 @@ '<@(openssl_defines_x64_elf)', ], 'sources': ['<@(openssl_sources_x64_elf_gas)'], + }, 'target_arch=="arm64"', { + 'defines': ['<@(openssl_defines_arm64)',], + 'sources': ['<@(openssl_sources_arm64_linux64_gas)'], }, { # Other architectures don't use assembly. 'defines': ['OPENSSL_NO_ASM'], |