JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

qt58.qtbase: remove OpenSSL library paths patch

Browse Source 
Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
This commit is contained in:
Thomas Tuegel 2017-04-22 12:29:14 -05:00
parent b70837e054
commit 5735edb894
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
View File

@ -234,8 +234,6 @@ stdenv.mkDerivation {
''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"'' ''-DNIXPKGS_QTCOMPOSE="${libX11.out}/share/X11/locale"''
''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBRESOLV="${stdenv.cc.libc.out}/lib/libresolv"''
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
''-DNIXPKGS_LIBSSL="${openssl.out}/lib/libssl"''
''-DNIXPKGS_LIBCRYPTO="${openssl.out}/lib/libcrypto"''
(if stdenv.isLinux (if stdenv.isLinux
then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"'' then ''-DNIXPKGS_LIBDBUS="${dbus.lib}/lib/libdbus-1"''
else ''-DNIXPKGS_LIBDBUS=""'') else ''-DNIXPKGS_LIBDBUS=""'')

26
pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
View File

@ -1,26 +0,0 @@
Index: qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
===================================================================
--- qtbase-opensource-src-5.8.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qtbase-opensource-src-5.8.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -681,8 +681,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(QStringLiteral(NIXPKGS_LIBSSL), QLatin1String(SHLIB_VERSION_NUMBER));
+ libcrypto->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBCRYPTO), QLatin1String(SHLIB_VERSION_NUMBER));
if (libcrypto->load() && libssl->load()) {
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
return pair;
@@ -699,8 +699,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(QStringLiteral(NIXPKGS_LIBSSL), -1);
+ libcrypto->setFileNameAndVersion(QStringLiteral(NIXPKGS_LIBCRYPTO), -1);
if (libcrypto->load() && libssl->load()) {
// libssl.so.0 and libcrypto.so.0 found
return pair;

1
pkgs/development/libraries/qt-5/5.8/qtbase/series
View File

@ -1,7 +1,6 @@
dlopen-resolv.patch dlopen-resolv.patch
tzdir.patch tzdir.patch
dlopen-libXcursor.patch dlopen-libXcursor.patch
dlopen-openssl.patch
dlopen-dbus.patch dlopen-dbus.patch
xdg-config-dirs.patch xdg-config-dirs.patch
compose-search-path.patch compose-search-path.patch