From 6d51b876121e472d4372496d609a26d7e3081c51 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 6 Sep 2017 23:19:19 +0300 Subject: [PATCH] bpo-30912: Don't check the content of ffi.h (GH-2687) 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. --- setup.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 3c7c9049ed6..79f96989a40 100644 --- a/setup.py +++ b/setup.py @@ -2021,16 +2021,9 @@ class PyBuildExt(build_ext): 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 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)) + if not os.path.exists(ffi_h): + ffi_inc = None + print('Header file {} does not exist'.format(ffi_h)) ffi_lib = None if ffi_inc is not None: for lib_name in ('ffi', 'ffi_pic'):