diff options
author | Kurt Jaeger <pi@FreeBSD.org> | 2016-05-25 19:55:11 +0000 |
---|---|---|
committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-05-25 19:55:11 +0000 |
commit | 63fd2e652833aded863922cc037f42d5458402cb (patch) | |
tree | 585483e3b4d3a2106374bf14b44c4a4144ad4e3c /net/qt5-network | |
parent | 858221df3e70ee7863017074ab9a2e5a91dd6a8f (diff) | |
download | ports-63fd2e652833aded863922cc037f42d5458402cb.tar.gz ports-63fd2e652833aded863922cc037f42d5458402cb.zip |
net/qt5-network: fix openssl runtime linking
PR: 209324
Submitted by: groot@kde.org (kde)
Notes
Notes:
svn path=/head/; revision=415860
Diffstat (limited to 'net/qt5-network')
-rw-r--r-- | net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp new file mode 100644 index 000000000000..183e29f2ffbe --- /dev/null +++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp @@ -0,0 +1,24 @@ +--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2015-02-17 04:56:38 UTC ++++ src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadO + #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("/usr/local/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + if (libcrypto->load() && libssl->load()) { + // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found + return pair; +@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadO + // 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("/usr/local/lib/libssl"), -1); ++ libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1); + if (libcrypto->load() && libssl->load()) { + // libssl.so.0 and libcrypto.so.0 found + return pair; |