Kaydet (Commit) 37471dc6 authored tarafından Christian Heimes's avatar Christian Heimes

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

üst db01b3e0
...@@ -186,6 +186,8 @@ Tests ...@@ -186,6 +186,8 @@ Tests
Build Build
----- -----
- Issue #26661: setup.py now detects system libffi with multiarch wrapper.
- Issue #15819: The Include directory in the build tree is already searched; - Issue #15819: The Include directory in the build tree is already searched;
drop unused code trying to add it again. drop unused code trying to add it again.
......
...@@ -2132,14 +2132,16 @@ class PyBuildExt(build_ext): ...@@ -2132,14 +2132,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'
fp = open(ffi_h) 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'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment