Port macOS specific ctypes code

Makefile.pre.in

@@ -340,10 +340,6 @@ IO_OBJS=	\
 		Modules/_io/bytesio.o \
 		Modules/_io/stringio.o
 
-##########################################################################
-
-LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
-
 ##########################################################################
 # Parser
 
@@ -2519,14 +2515,15 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
 .PHONY: gdbhooks
 
 ##########################################################################
-# Module dependencies
+# Module dependencies and platform-specific files
 
 MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
 MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
 MODULE_PYEXPAT_DEPS=$(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
 MODULE_UNICODEDATA_DEPS=$(srcdir)/Modules/unicodedata_db.h $(srcdir)/Modules/unicodename_db.h
 MODULE__BLAKE2_DEPS=$(srcdir)/Modules/_blake2/impl/blake2-config.h $(srcdir)/Modules/_blake2/impl/blake2-impl.h $(srcdir)/Modules/_blake2/impl/blake2.h $(srcdir)/Modules/_blake2/impl/blake2b-load-sse2.h $(srcdir)/Modules/_blake2/impl/blake2b-load-sse41.h $(srcdir)/Modules/_blake2/impl/blake2b-ref.c $(srcdir)/Modules/_blake2/impl/blake2b-round.h $(srcdir)/Modules/_blake2/impl/blake2b.c $(srcdir)/Modules/_blake2/impl/blake2s-load-sse2.h $(srcdir)/Modules/_blake2/impl/blake2s-load-sse41.h $(srcdir)/Modules/_blake2/impl/blake2s-load-xop.h $(srcdir)/Modules/_blake2/impl/blake2s-ref.c $(srcdir)/Modules/_blake2/impl/blake2s-round.h $(srcdir)/Modules/_blake2/impl/blake2s.c $(srcdir)/Modules/_blake2/blake2module.h $(srcdir)/Modules/hashlib.h
-MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h
+MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h $(srcdir)/Modules/_ctypes/darwin/dlfcn.h
+MODULE__CTYPES_MALLOC_CLOSURE=@MODULE__CTYPES_MALLOC_CLOSURE@
 MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h $(LIBMPDEC_HEADERS) @LIBMPDEC_INTERNAL@
 MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c $(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
 MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h

Modules/Setup.stdlib.in

@@ -136,7 +136,7 @@
 #
 
 # needs -lffi and -ldl
-@MODULE__CTYPES_TRUE@_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c
+@MODULE__CTYPES_TRUE@_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c @MODULE__CTYPES_MALLOC_CLOSURE@
 
 # needs -lncurses, -lncursesw or -lcurses, sometimes -ltermcap
 #@MODULE__CURSES_TRUE@_curses _cursesmodule.c

Modules/_ctypes/callproc.c

@@ -54,6 +54,9 @@
 
  */
 
+#ifndef Py_BUILD_CORE_BUILTIN
+#  define Py_BUILD_CORE_MODULE 1
+#endif
 #define NEEDS_PY_IDENTIFIER
 
 #include "Python.h"

Modules/_ctypes/malloc_closure.c

@@ -1,3 +1,6 @@
+#ifndef Py_BUILD_CORE_BUILTIN
+#  define Py_BUILD_CORE_MODULE 1
+#endif
 #include <Python.h>
 #include <ffi.h>
 #ifdef MS_WIN32

configure.ac

@@ -3574,18 +3574,29 @@ AS_VAR_IF([with_system_ffi], [yes], [
       ])
     ])
   ])
-], [
-  dnl private ffi copy
-  have_libffi=yes
-  LIBFFI_CFLAGS="-I\$(srcdir)/Modules/_ctypes/darwin -DUSING_MALLOC_CLOSURE_DOT_C=1 -DMACOSX"
-  LIBFFI_LIBS=
 ])
 
-dnl _ctypes needs -ldl for dlopen
-AS_CASE([$LIBS],
-  [*-ldl*], [LIBFFI_LIBS="$LIBFFI_LIBS -ldl"]
+ctypes_malloc_closure=no
+
+AS_CASE([$ac_sys_system],
+  [Darwin], [
+    dnl when do we need USING_APPLE_OS_LIBFFI?
+    AS_VAR_APPEND([LIBFFI_CFLAGS], ['-I$(srcdir)/Modules/_ctypes/darwin -DMACOSX '])
+    ctypes_malloc_closure=yes
+  ],
+  [sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [-mimpure-text])],
+  [hp*|HP*], [AS_VAR_APPEND([LIBFFI_LIBS], [-fPIC])]
 )
 
+AS_VAR_IF([ctypes_malloc_closure], [yes], [
+  MODULE__CTYPES_MALLOC_CLOSURE=_ctypes/malloc_closure.c
+  AS_VAR_APPEND([LIBFFI_CFLAGS], ['-DUSING_MALLOC_CLOSURE_DOT_C=1 '])
+])
+AC_SUBST([MODULE__CTYPES_MALLOC_CLOSURE])
+
+dnl HAVE_LIBDL: for dlopen, see bpo-32647
+AS_VAR_IF([ac_cv_lib_dl_dlopen], [yes], [AS_VAR_APPEND([LIBFFI_LIBS], [-ldl])])
+
 if test "$with_system_ffi" = yes -a "$have_libffi" = yes; then
   WITH_SAVE_ENV([
     CFLAGS="$LIBFFI_CFLAGS $CFLAGS"
@@ -3617,14 +3628,6 @@ if test "$with_system_ffi" = yes -a "$have_libffi" = yes; then
   ])
 fi
 
-
-if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then
-    LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
-else
-    LIBFFI_INCLUDEDIR=""
-fi
-AC_SUBST(LIBFFI_INCLUDEDIR)
-
 # Check for use of the system libmpdec library
 AC_MSG_CHECKING(for --with-system-libmpdec)
 AC_ARG_WITH(system_libmpdec,

setup.py

@@ -1365,103 +1365,23 @@ def detect_tkinter(self):
         self.addext(Extension('_tkinter', ['_tkinter.c', 'tkappinit.c']))
 
     def detect_ctypes(self):
-        ext = Extension(
-            '_ctypes',
-            [
-                '_ctypes/_ctypes.c',
-                '_ctypes/callbacks.c',
-                '_ctypes/callproc.c',
-                '_ctypes/stgdict.c',
-                '_ctypes/cfield.c',
-            ]
+        # Thomas Heller's _ctypes module
+        src = [
+            '_ctypes/_ctypes.c',
+            '_ctypes/callbacks.c',
+            '_ctypes/callproc.c',
+            '_ctypes/stgdict.c',
+            '_ctypes/cfield.c',
+        ]
+        malloc_closure = sysconfig.get_config_var(
+            "MODULE__CTYPES_MALLOC_CLOSURE"
         )
-        if MACOS:
-            self._build_ctypes_macos(ext)
-        else:
-            self.use_system_libffi = True
-            self.addext(ext)
+        if malloc_closure:
+            src.append(malloc_closure)
 
+        self.addext(Extension('_ctypes', src))
         self.addext(Extension('_ctypes_test', ['_ctypes/_ctypes_test.c']))
 
-    def _build_ctypes_macos(self, ext):
-        # Thomas Heller's _ctypes module
-
-        if (not sysconfig.get_config_var("LIBFFI_INCLUDEDIR") and MACOS):
-            self.use_system_libffi = True
-        else:
-            self.use_system_libffi = '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS")
-
-        if MACOS:
-            ext.sources.append('_ctypes/malloc_closure.c')
-            ext.extra_compile_args.append('-DUSING_MALLOC_CLOSURE_DOT_C=1')
-            ext.extra_compile_args.append('-DMACOSX')
-            ext.include_dirs.append('_ctypes/darwin')
-
-        elif HOST_PLATFORM == 'sunos5':
-            # XXX This shouldn't be necessary; it appears that some
-            # of the assembler code is non-PIC (i.e. it has relocations
-            # when it shouldn't. The proper fix would be to rewrite
-            # the assembler code to be PIC.
-            # This only works with GCC; the Sun compiler likely refuses
-            # this option. If you want to compile ctypes with the Sun
-            # compiler, please research a proper solution, instead of
-            # finding some -z option for the Sun compiler.
-            ext.extra_link_args.append('-mimpure-text')
-
-        elif HOST_PLATFORM.startswith('hp-ux'):
-            ext.extra_link_args.append('-fPIC')
-
-        self.add(ext)
-
-        ffi_inc = sysconfig.get_config_var("LIBFFI_INCLUDEDIR")
-        ffi_lib = None
-
-        ffi_inc_dirs = self.inc_dirs.copy()
-        if MACOS:
-            ffi_in_sdk = os.path.join(macosx_sdk_root(), "usr/include/ffi")
-
-            if not ffi_inc:
-                if os.path.exists(ffi_in_sdk):
-                    ext.extra_compile_args.append("-DUSING_APPLE_OS_LIBFFI=1")
-                    ffi_inc = ffi_in_sdk
-                    ffi_lib = 'ffi'
-                else:
-                    # OS X 10.5 comes with libffi.dylib; the include files are
-                    # in /usr/include/ffi
-                    ffi_inc_dirs.append('/usr/include/ffi')
-
-        if not ffi_inc:
-            found = find_file('ffi.h', [], ffi_inc_dirs)
-            if found:
-                ffi_inc = found[0]
-        if ffi_inc:
-            ffi_h = ffi_inc + '/ffi.h'
-            if not os.path.exists(ffi_h):
-                ffi_inc = None
-                print('Header file {} does not exist'.format(ffi_h))
-        if ffi_lib is None and ffi_inc:
-            for lib_name in ('ffi', 'ffi_pic'):
-                if (self.compiler.find_library_file(self.lib_dirs, lib_name)):
-                    ffi_lib = lib_name
-                    break
-
-        if ffi_inc and ffi_lib:
-            ffi_headers = glob(os.path.join(ffi_inc, '*.h'))
-            if grep_headers_for('ffi_prep_cif_var', ffi_headers):
-                ext.extra_compile_args.append("-DHAVE_FFI_PREP_CIF_VAR=1")
-            if grep_headers_for('ffi_prep_closure_loc', ffi_headers):
-                ext.extra_compile_args.append("-DHAVE_FFI_PREP_CLOSURE_LOC=1")
-            if grep_headers_for('ffi_closure_alloc', ffi_headers):
-                ext.extra_compile_args.append("-DHAVE_FFI_CLOSURE_ALLOC=1")
-
-            ext.include_dirs.append(ffi_inc)
-            ext.libraries.append(ffi_lib)
-            self.use_system_libffi = True
-
-        if sysconfig.get_config_var('HAVE_LIBDL'):
-            # for dlopen, see bpo-32647
-            ext.libraries.append('dl')
-
     def detect_decimal(self):
         # Stefan Krah's _decimal module
         self.addext(