Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Linux build: include both ffi libs

Browse Source 
Include the ffi libs from both gcc and libffi. Fixes #1186148 [libffi.so.6 not available in debian sid](https://bugs.launchpad.net/calibre/+bug/1186148)
This commit is contained in:
Kovid Goyal 2013-05-31 13:31:07 +05:30
parent 924dff4955
commit afde67471f
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
setup/installer/linux/freeze2.py
View File

@ -105,14 +105,13 @@ class LinuxFreeze(Command):
gcc_lib = '/usr/lib/gcc/%s/%s/'%(chost.strip(), gcc.strip()) gcc_lib = '/usr/lib/gcc/%s/%s/'%(chost.strip(), gcc.strip())
stdcpp = gcc_lib+'libstdc++.so.?' stdcpp = gcc_lib+'libstdc++.so.?'
stdcpp = glob.glob(stdcpp)[-1] stdcpp = glob.glob(stdcpp)[-1]
ffi_libs = [glob.glob('/usr/lib/libffi.so.?')[-1]]
ffi = gcc_lib+'libffi.so.?' ffi = gcc_lib+'libffi.so.?'
ffi = glob.glob(ffi) ffi = glob.glob(ffi)
if ffi: if ffi and ffi[-1] not in ffi_libs:
ffi = ffi[-1] ffi_libs.append(ffi[-1])
else:
ffi = glob.glob('/usr/lib/libffi.so.?')[-1]
for x in binary_includes + [stdcpp, ffi]: for x in binary_includes + [stdcpp] + ffi_libs:
dest = self.bin_dir if '/bin/' in x else self.lib_dir dest = self.bin_dir if '/bin/' in x else self.lib_dir
shutil.copy2(x, dest) shutil.copy2(x, dest)
shutil.copy2('/usr/lib/libpython%s.so.1.0'%self.py_ver, dest) shutil.copy2('/usr/lib/libpython%s.so.1.0'%self.py_ver, dest)