Skip to content

Commit

Permalink
build: configure openssl
Browse files Browse the repository at this point in the history
* compile with -DOPENSSL_NO_SOCK and -DOPENSSL_NO_DGRAM, we don't need it
* compile with -DOPENSSL_NO_GOST and -DOPENSSL_NO_HW_PADLOCK, works around the
  brain dead linker on solaris and maybe others
* compile with -DTERMIOS, OS X doesn't have <termio.h>
* compile with -D__EXTENSIONS__ on solaris, makes siginfo_t available
* compile without -ansi on linux, it hides a number of POSIX declarations
  (sigaction, NI_MAXHOST, etc.)
  • Loading branch information
bnoordhuis committed Apr 11, 2012
1 parent 3694b69 commit 2639566
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 40 deletions.
1 change: 0 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
'ldflags': [ '-m32' ],
}],
[ 'OS=="linux"', {
'cflags': [ '-ansi' ],
'ldflags': [ '-rdynamic' ],
}],
[ 'OS=="solaris"', {
Expand Down
62 changes: 23 additions & 39 deletions deps/openssl/openssl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
'L_ENDIAN',
'OPENSSL_THREADS',
'PURIFY',
'TERMIO',
'_REENTRANT',
# We do not use TLS over UDP on Chromium so far.
'OPENSSL_NO_DTLS1',
'OPENSSL_NO_SOCK',
'OPENSSL_NO_DGRAM',
# Work around brain dead SunOS linker.
'OPENSSL_NO_GOST',
'OPENSSL_NO_HW_PADLOCK',
],
'sources': [
'openssl/ssl/bio_ssl.c',
Expand Down Expand Up @@ -618,55 +622,35 @@
'openssl/engines/e_sureware.c',
'openssl/engines/e_ubsec.c',
],
'sources/': [
['exclude', 'camellia/.*$'],
['exclude', 'cms/.*$'],
['exclude', 'mdc2/.*$'],
],
'conditions': [
['os_posix==1 and OS!="android"', {
['OS=="win"', {
'defines': [
'MK1MF_BUILD',
'WIN32_LEAN_AND_MEAN',
]
}, {
'defines': [
# ENGINESDIR must be defined if OPENSSLDIR is.
'ENGINESDIR="/dev/null"',
# Set to ubuntu default path for convenience. If necessary, override
# this at runtime with the SSL_CERT_DIR environment variable.
'OPENSSLDIR="/etc/ssl"',
'TERMIOS',
],
'variables': {
'conditions': [
['target_arch=="ia32"', {
'openssl_config_path': 'config/piii',
}, {
'openssl_config_path': 'config/k8',
}],
],
},
}],
['OS=="android"', {
'variables': {
'openssl_config_path': 'config/android',
},
'sources/': [
['exclude', 'cast/.*$'],
['exclude', 'crypto/md2/.*$'],
['exclude', 'crypto/store/.*$'],
['exclude', 'crypto/whrlpool/.$'],
],
['OS=="solaris"', {
'defines': ['__EXTENSIONS__'],
}],
['target_arch=="ia32"', {
'variables': {'openssl_config_path': 'config/piii'},
}, {
'sources/': [
['exclude', 'camellia/.*$'],
['exclude', 'cms/.*$'],
['exclude', 'mdc2/.*$'],
],
'variables': {'openssl_config_path': 'config/k8'},
}],
['clang==1', {
'cflags': [
# OpenSSL has a few |if ((foo == NULL))| checks.
'-Wno-parentheses-equality',
# OpenSSL uses several function-style macros and then ignores the
# returned value.
'-Wno-unused-value',
],
}, { # Not clang. Disable all warnings.
'cflags': [
'-w',
],
}]
],
'include_dirs': [
'.',
Expand Down

0 comments on commit 2639566

Please sign in to comment.