mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-08-11 09:13:57 -04:00
Fix lib names for OpenSSL 1.1
This commit is contained in:
parent
2d342d3429
commit
1f1d8024cb
@ -44,7 +44,7 @@ def binary_includes():
|
|||||||
' gobject-2.0 glib-2.0 gthread-2.0 gmodule-2.0 gio-2.0 dbus-glib-1').split()
|
' gobject-2.0 glib-2.0 gthread-2.0 gmodule-2.0 gio-2.0 dbus-glib-1').split()
|
||||||
)) + [
|
)) + [
|
||||||
get_dll_path('podofo', 3), get_dll_path('bz2', 2), j(PREFIX, 'lib', 'libunrar.so'),
|
get_dll_path('podofo', 3), get_dll_path('bz2', 2), j(PREFIX, 'lib', 'libunrar.so'),
|
||||||
get_dll_path('ssl', 3), get_dll_path('crypto', 3), get_dll_path('python' + py_ver, 2),
|
get_dll_path('ssl', 2), get_dll_path('crypto', 2), get_dll_path('python' + py_ver, 2),
|
||||||
# We dont include libstdc++.so as the OpenGL dlls on the target
|
# We dont include libstdc++.so as the OpenGL dlls on the target
|
||||||
# computer fail to load in the QPA xcb plugin if they were compiled
|
# computer fail to load in the QPA xcb plugin if they were compiled
|
||||||
# with a newer version of gcc than the one on the build computer.
|
# with a newer version of gcc than the one on the build computer.
|
||||||
|
@ -496,7 +496,7 @@ class Freeze(object):
|
|||||||
'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0',
|
'usb-1.0.0', 'mtp.9', 'chm.0', 'sqlite3.0', 'hunspell-1.7.0',
|
||||||
'icudata.67', 'icui18n.67', 'icuio.67', 'icuuc.67', 'hyphen.0',
|
'icudata.67', 'icui18n.67', 'icuio.67', 'icuuc.67', 'hyphen.0',
|
||||||
'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5',
|
'xslt.1', 'exslt.0', 'xml2.2', 'z.1', 'unrar', 'lzma.5',
|
||||||
'crypto.1.0.0', 'ssl.1.0.0', 'iconv.2', # 'ltdl.7'
|
'crypto.1.1', 'ssl.1.1', 'iconv.2', # 'ltdl.7'
|
||||||
):
|
):
|
||||||
print('\nAdding', x)
|
print('\nAdding', x)
|
||||||
x = 'lib%s.dylib' % x
|
x = 'lib%s.dylib' % x
|
||||||
|
Loading…
x
Reference in New Issue
Block a user