mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

bpo-30912: Don't check the content of ffi.h (GH-2687)

Browse source 
Various platforms have various methods of handling multiarch libffi which probably won't match the previously looked-for defines.  Now we just make sure that ffi.h is available.
This commit is contained in:
Shlomi Fish 2017-09-06 23:19:19 +03:00 • committed by Zachary Ware
parent c5bace2bf7
commit 6d51b87612
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
setup.py
View file

@ -2021,16 +2021,9 @@ 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 f: if not os.path.exists(ffi_h):
for line in f: ffi_inc = None
line = line.strip() print('Header file {} does not exist'.format(ffi_h))
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 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'):