Skip to content

Commit

Permalink
deps: update openssl.gyp/gypi for openssl-1.0.2a
Browse files Browse the repository at this point in the history
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: #589
PR-URL: #1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
Shigeki Ohtsu committed Apr 14, 2015
1 parent 02f12ab commit 418e839
Show file tree
Hide file tree
Showing 2 changed files with 119 additions and 39 deletions.
5 changes: 4 additions & 1 deletion deps/openssl/openssl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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)',
Expand Down Expand Up @@ -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'],
Expand Down
Loading

0 comments on commit 418e839

Please sign in to comment.