AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Do not link "prefixed" openssl libs on Android

Browse Source 
This reverts e52239f525, because we do not
have multi-ABI builds currently, and we must link against what the
WrapOpenSSL package provides.

Fixes: QTBUG-89473
Change-Id: I4f38a2c41e90ec8b602e28f8ca77f0ebd009639c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Joerg Bornemann 2020-12-17 14:06:58 +01:00
parent 9f432a540a
commit ed432b070a
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/network/CMakeLists.txt
View File

@ -392,13 +392,7 @@ qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND Q
ssl/qsslsocket_openssl_android.cpp
)
qt_internal_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi)
LIBRARIES
crypto_${CMAKE_SYSTEM_PROCESSOR}
ssl_${CMAKE_SYSTEM_PROCESSOR}
)
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND NOT ANDROID
qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
LIBRARIES
WrapOpenSSL::WrapOpenSSL
PRIVATE_MODULE_INTERFACE

6
src/network/configure.json
View File

@ -108,10 +108,6 @@
"libs": "-llibssl -llibcrypto -lUser32 -lWs2_32 -lAdvapi32 -lCrypt32",
"condition": "config.msvc"
},
{
"libs": "-lssl_arm64-v8a -lcrypto_arm64-v8a",
"condition": "config.android"
},
{
"libs": "-lssl -lcrypto",
"condition": "!config.msvc"
@ -447,7 +443,7 @@
"report": [
{
"type": "note",
"condition": "!config.android && features.openssl-linked && libs.openssl.source != 0
"condition": "features.openssl-linked && libs.openssl.source != 0
&& input.openssl.prefix == '' && input.openssl.libs == '' && input.openssl.libs.debug == ''",
"message": "When linking against OpenSSL, you can override the default
library names through OPENSSL_LIBS.