mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #26661: setup.py now detects system libffi with multiarch wrapper.

This commit is contained in:
Christian Heimes 2016-09-18 14:34:13 +02:00
parent 44efa8aa0b 96b2dd5997
commit 85c98bf968
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -93,6 +93,8 @@ Windows
Build Build
----- -----
- Issue #26661: setup.py now detects system libffi with multiarch wrapper.
- Issue #15819: Remove redundant include search directory option for building - Issue #15819: Remove redundant include search directory option for building
outside the source tree. outside the source tree.

16
setup.py
View File

@ -2025,14 +2025,16 @@ def detect_ctypes(self, inc_dirs, lib_dirs):
ffi_inc = find_file('ffi.h', [], inc_dirs) ffi_inc = find_file('ffi.h', [], inc_dirs)
if ffi_inc is not None: if ffi_inc is not None:
ffi_h = ffi_inc[0] + '/ffi.h' ffi_h = ffi_inc[0] + '/ffi.h'
with open(ffi_h) as fp: with open(ffi_h) as f:
while 1: for line in f:
line = fp.readline() line = line.strip()
if not line: if line.startswith(('#define LIBFFI_H',
ffi_inc = None '#define ffi_wrapper_h')):
break
if line.startswith('#define LIBFFI_H'):
break break
else:
ffi_inc = None
print('Header file {} does not define LIBFFI_H or '
'ffi_wrapper_h'.format(ffi_h))
ffi_lib = None ffi_lib = None
if ffi_inc is not None: if ffi_inc is not None:
for lib_name in ('ffi', 'ffi_pic'): for lib_name in ('ffi', 'ffi_pic'):