38 lines
2.1 KiB
Diff
38 lines
2.1 KiB
Diff
From 2d7e4e21291238e2b41d0e173f918cd3530c8ade Mon Sep 17 00:00:00 2001
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
|
Date: Sun, 23 Aug 2015 08:52:04 -0500
|
|
Subject: [PATCH 06/11] dlopen openssl
|
|
|
|
---
|
|
qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
|
index e2700df..a7ccf88 100644
|
|
--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
|
+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
|
@@ -640,8 +640,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
|
|
#endif
|
|
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
|
|
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
|
|
- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
|
|
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
|
|
+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
|
|
+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
|
|
if (libcrypto->load() && libssl->load()) {
|
|
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
|
|
return pair;
|
|
@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
|
|
// OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
|
|
// attempt, _after_ <bundle>/Contents/Frameworks has been searched.
|
|
// iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
|
|
- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
|
|
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
|
|
+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
|
|
+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
|
|
if (libcrypto->load() && libssl->load()) {
|
|
// libssl.so.0 and libcrypto.so.0 found
|
|
return pair;
|
|
--
|
|
2.5.2
|
|
|