languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-16 00:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Christian Heimes 2016-09-18 14:35:39 +02:00
parent 892cc19524 85c98bf968
commit aa630e051b
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

@ -99,6 +99,8 @@ Windows
Build
-----
- Issue #26661: setup.py now detects system libffi with multiarch wrapper.
- Issue #27979: A full copy of libffi is no longer bundled for use when
building _ctypes on non-OSX UNIX platforms. An installed copy of libffi is
now required when building _ctypes on such platforms.

16
setup.py
View file

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