diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2014-03-05 15:33:35 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 19:44:39 +0100 |
| commit | 7a2df582e79e6dedebf904b6f14f47ddb4a72744 (patch) | |
| tree | 227e503c786ec5c6b41dff6488ebc6b025154b1f | |
| parent | bab95c52e78834e46383086ca827336e4e4eeecb (diff) | |
Override OPENSSLDIR for embedded linux.
Boot2Qt will ship openssl configuration and
ca certificates in /usr/lib/ssl.
At runtime the environment variable SSL_CERT_DIR
can be used to override the location for
certificates.
Change-Id: Ib5a55f0ff6874e497b3ca9163e4a11f3a1805de0
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 8846814b7..bb39116f9 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -45,22 +45,24 @@ ], }, 'conditions': [ - [ 'OS=="linux" and qt_cross_compile==1', { + [ 'qt_os=="embedded_linux"', { 'target_defaults': { + 'defines': [ + 'GL_GLEXT_PROTOTYPES', + 'EGL_EGLEXT_PROTOTYPES', + # At runtime the env variable SSL_CERT_DIR can be used to override this + 'OPENSSLDIR="/usr/lib/ssl"', + 'OPENSSL_LOAD_CONF', + ], + 'defines!': [ + 'OPENSSLDIR="/etc/ssl"', + ], + 'ldflags!': ['<!@(icu-config --ldflags)'], # remove garbage added by icu.gyp 'target_conditions': [ - ['_toolset=="target"', { - 'ldflags!': ['<!@(icu-config --ldflags)'], # remove garbage added by icu.gyp - 'defines': [ - 'GL_GLEXT_PROTOTYPES', - 'EGL_EGLEXT_PROTOTYPES', - ], - 'target_conditions': [ - ['_type=="shared_library"', { - 'ldflags': [ - # Tell the linker to prefer symbols within the library before looking outside - '-Wl,-shared,-Bsymbolic', - ], - }], + ['_type=="shared_library"', { + 'ldflags': [ + # Tell the linker to prefer symbols within the library before looking outside + '-Wl,-shared,-Bsymbolic', ], }], ], |