mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Christian Heimes 2016-09-18 14:33:30 +02:00
parent 5a5ae745ff
commit 96b2dd5997
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -364,6 +364,8 @@ Windows
Build Build
----- -----
- Issue #26661: setup.py now detects system libffi with multiarch wrapper.
- Issue #28066: Fix the logic that searches build directories for generated - Issue #28066: Fix the logic that searches build directories for generated
include files when building outside the source tree. include files when building outside the source tree.

16
setup.py
View file

@ -1997,14 +1997,16 @@ class PyBuildExt(build_ext):
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',
'#define ffi_wrapper_h')):
break
else:
ffi_inc = None ffi_inc = None
break print('Header file {} does not define LIBFFI_H or '
if line.startswith('#define LIBFFI_H'): 'ffi_wrapper_h'.format(ffi_h))
break
ffi_lib = None ffi_lib = None
if ffi_inc is not None: if ffi_inc is not None:
for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'): for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):