Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Fix openssl build on arm targets #3914

Closed
wants to merge 2 commits into from
Closed

Fix openssl build on arm targets #3914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3201f25
build: use the openssl android configuration for "arm" builds
TooTallNate Aug 23, 2012
8728f85
build: tweak the openssl android configuration to build
TooTallNate Aug 23, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions deps/openssl/config/android/openssl/opensslconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#ifndef OPENSSL_DOING_MAKEDEPEND


#ifndef OPENSSL_NO_CAST
# define OPENSSL_NO_CAST
#ifndef OPENSSL_NO_CAMELLIA
# define OPENSSL_NO_CAMELLIA
#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
Expand All @@ -20,8 +20,11 @@
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#ifndef OPENSSL_NO_MDC2
# define OPENSSL_NO_MDC2
#endif
#ifndef OPENSSL_NO_CMS
# define OPENSSL_NO_CMS
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
Expand All @@ -35,9 +38,6 @@
#ifndef OPENSSL_NO_SHA0
# define OPENSSL_NO_SHA0
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#ifndef OPENSSL_NO_WHRLPOOL
# define OPENSSL_NO_WHRLPOOL
#endif
Expand Down Expand Up @@ -92,6 +92,9 @@
# if defined(OPENSSL_NO_WHRLPOOL) && !defined(NO_WHRLPOOL)
# define NO_WHRLPOOL
# endif
# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
# define NO_MDC2
# endif
#endif

/* crypto/opensslconf.h.in */
Expand Down
6 changes: 5 additions & 1 deletion deps/openssl/openssl.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,13 @@
}],
['target_arch=="ia32"', {
'variables': {'openssl_config_path': 'config/piii'},
}, {
}],
['target_arch=="x64"', {
'variables': {'openssl_config_path': 'config/k8'},
}],
['target_arch=="arm"', {
'variables': {'openssl_config_path': 'config/android'},
}],
],
'include_dirs': [
'.',
Expand Down