From 4aadd1c63fd1cb741df3b326fd5569e7c9c3b345 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 14 Jul 2017 20:39:02 +0300 Subject: [PATCH] bpo-30912: Fixed cannot find "ffi.h" with multiarch See http://bugs.python.org/issue30912 - ffi.h does not match the substrings on Mageia v6. Now we just check that it exists, otherwise it is not our problem. (Fixed per the comments on the pull-req at https://github.com/python/cpython/pull/2687#discussion_r127231784 . ). --- setup.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index 41aad8210d8267..636895db88239c 100644 --- a/setup.py +++ b/setup.py @@ -2003,16 +2003,9 @@ 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 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'):