Skip to content

bpo-36146: Fix inc_dirs in setup.py on macOS #12098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Mar 1, 2019
Merged

bpo-36146: Fix inc_dirs in setup.py on macOS #12098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-36146: Fix inc_dirs in setup.py on macOS 
Fix setup.py on macOS: only add /usr/include/ffi to include
directories of _ctypes, not for all extensions.
  • Loading branch information
@vstinner
vstinner committed Feb 28, 2019
commit 05087a66c5d9f23aa1d34919d5d06cca1ce175bb
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2019-02-28-18-09-01.bpo-36146.IwPJVT.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix setup.py on macOS: only add ``/usr/include/ffi`` to include
directories of _ctypes, not for all extensions.
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2003,16 +2003,17 @@ def detect_ctypes(self, inc_dirs, lib_dirs):
libraries=['m'])
self.extensions.extend([ext, ext_test])

ffi_inc_dirs = inc_dirs.copy()
if MACOS:
if '--with-system-ffi' not in sysconfig.get_config_var("CONFIG_ARGS"):
return
# OS X 10.5 comes with libffi.dylib; the include files are
# in /usr/include/ffi
inc_dirs.append('/usr/include/ffi')
ffi_inc_dirs.append('/usr/include/ffi')

ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
if not ffi_inc or ffi_inc[0] == '':
ffi_inc = find_file('ffi.h', [], inc_dirs)
ffi_inc = find_file('ffi.h', [], ffi_inc_dirs)
if ffi_inc is not None:
ffi_h = ffi_inc[0] + '/ffi.h'
if not os.path.exists(ffi_h):
Expand Down