39 lines
2.0 KiB
Diff
39 lines
2.0 KiB
Diff
|
From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Tuegel <ttuegel@gmail.com>
|
||
|
|
Date: Mon, 1 Dec 2014 17:35:21 -0600
|
||
|
|
Subject: [PATCH] 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 4e6200f..d9c3e7d 100644
|
||
|
|
--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||
|
|
+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
|
||
|
|
@@ -585,8 +585,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;
|
||
|
|
@@ -597,8 +597,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
|
||
|
|
#endif
|
||
|
|
|
||
|
|
// second attempt: find the development files libssl.so and libcrypto.so
|
||
|
|
- 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.1.3
|
||
|
|
|