Skip to content

Commit

Permalink
Hooks: Include Qt libraries needed for SSL support.
Browse files Browse the repository at this point in the history
  • Loading branch information
bjones1 committed Aug 1, 2019
1 parent ce1eb48 commit 47bd7f1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
16 changes: 7 additions & 9 deletions PyInstaller/hooks/hook-PyQt5.QtNetwork.py
Expand Up @@ -11,7 +11,6 @@
from PyInstaller.utils.hooks import eval_statement
from PyInstaller.utils.hooks.qt import add_qt5_dependencies, pyqt5_library_info
from PyInstaller.compat import is_win
from PyInstaller.depend.bindepend import getfullnameof

# Ensure PyQt5 is importable before adding info depending on it.
if pyqt5_library_info.version:
Expand All @@ -22,11 +21,10 @@
from PyQt5.QtNetwork import QSslSocket
print(QSslSocket.supportsSsl())""")):

rel_data_path = ['PyQt5', 'Qt', 'bin']
binaries += [
# Per http://doc.qt.io/qt-5/ssl.html#enabling-and-disabling-ssl-support,
# the SSL libraries are dynamically loaded, implying they exist in
# the system path. Include these.
(getfullnameof('libeay32.dll'), os.path.join(*rel_data_path)),
(getfullnameof('ssleay32.dll'), os.path.join(*rel_data_path)),
]
binaries = []
for dll in ('libeay32.dll', 'ssleay32.dll', 'libssl-1_1-x64.dll',
'libcrypto-1_1-x64.dllx'):
dll_path = os.path.join(pyqt5_library_info.location['BinariesPath'],
dll)
if os.path.exists(dll_path):
binaries.append((dll_path, '.'))
1 change: 1 addition & 0 deletions news/4321.hooks.rst
@@ -0,0 +1 @@
Update PyQt5 to package 64-bit SSL support DLLs.

0 comments on commit 47bd7f1

Please sign in to comment.