From afde67471f01ccb0f564e31238cb60d6c5d12644 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 31 May 2013 13:31:07 +0530 Subject: [PATCH] Linux build: include both ffi libs 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) --- setup/installer/linux/freeze2.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/setup/installer/linux/freeze2.py b/setup/installer/linux/freeze2.py index 8a4e2db153..6167109d97 100644 --- a/setup/installer/linux/freeze2.py +++ b/setup/installer/linux/freeze2.py @@ -105,14 +105,13 @@ class LinuxFreeze(Command): gcc_lib = '/usr/lib/gcc/%s/%s/'%(chost.strip(), gcc.strip()) stdcpp = gcc_lib+'libstdc++.so.?' stdcpp = glob.glob(stdcpp)[-1] + ffi_libs = [glob.glob('/usr/lib/libffi.so.?')[-1]] ffi = gcc_lib+'libffi.so.?' ffi = glob.glob(ffi) - if ffi: - ffi = ffi[-1] - else: - ffi = glob.glob('/usr/lib/libffi.so.?')[-1] + if ffi and ffi[-1] not in ffi_libs: + ffi_libs.append(ffi[-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 shutil.copy2(x, dest) shutil.copy2('/usr/lib/libpython%s.so.1.0'%self.py_ver, dest)