10000 gh-90005: Port _ctypes to PY_STDLIB_MOD (GH-32229) · python/cpython@bb8b931 · GitHub
[go: up one dir, main page]
Skip to content

Commit bb8b931

Browse files
tirantiran
authored
gh-90005: Port _ctypes to PY_STDLIB_MOD (GH-32229)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no> Automerge-Triggered-By: GH:tiran
1 parent cc0d5e5 commit bb8b931

File tree

9 files changed

+660
-147
lines changed

9 files changed

+660
-147
lines changed

‎Makefile.pre.in

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,6 @@ IO_OBJS= \
340340
Modules/_io/bytesio.o \
341341
Modules/_io/stringio.o
342342

343-
##########################################################################
344-
345-
LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
346-
347343
##########################################################################
348344
# Parser
349345

@@ -2519,14 +2515,15 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h
25192515
.PHONY: gdbhooks
25202516

25212517
##########################################################################
2522-
# Module dependencies
2518+
# Module dependencies and platform-specific files
25232519

25242520
MODULE_CMATH_DEPS=$(srcdir)/Modules/_math.h
25252521
MODULE_MATH_DEPS=$(srcdir)/Modules/_math.h
25262522
MODULE_PYEXPAT_DEPS=$(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
25272523
MODULE_UNICODEDATA_DEPS=$(srcdir)/Modules/unicodedata_db.h $(srcdir)/Modules/unicodename_db.h
25282524
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
2529-
MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h
2525+
MODULE__CTYPES_DEPS=$(srcdir)/Modules/_ctypes/ctypes.h $(srcdir)/Modules/_ctypes/darwin/dlfcn.h
2526+
MODULE__CTYPES_MALLOC_CLOSURE=@MODULE__CTYPES_MALLOC_CLOSURE@
25302527
MODULE__DECIMAL_DEPS=$(srcdir)/Modules/_decimal/docstrings.h $(LIBMPDEC_HEADERS) @LIBMPDEC_INTERNAL@
25312528
MODULE__ELEMENTTREE_DEPS=$(srcdir)/Modules/pyexpat.c $(LIBEXPAT_HEADERS) @LIBEXPAT_INTERNAL@
25322529
MODULE__HASHLIB_DEPS=$(srcdir)/Modules/hashlib.h

‎Misc/NEWS.d/next/Library/2022-04-01-12-35-44.gh-issue-90005.pvaLHQ.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
:mod:`ctypes` dependency ``libffi`` is now detected with ``pkg-config``.

‎Modules/Setup.stdlib.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
#
137137

138138
# needs -lffi and -ldl
139-
#@MODULE__CTYPES_TRUE@_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c
139+
@MODULE__CTYPES_TRUE@_ctypes _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c @MODULE__CTYPES_MALLOC_CLOSURE@
140140

141141
# needs -lncurses, -lncursesw or -lcurses, sometimes -ltermcap
142142
#@MODULE__CURSES_TRUE@_curses _cursesmodule.c

‎Modules/_ctypes/callproc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
5555
*/
5656

57+
#ifndef Py_BUILD_CORE_BUILTIN
58+
# define Py_BUILD_CORE_MODULE 1
59+
#endif
5760
#define NEEDS_PY_IDENTIFIER
5861

5962
#include "Python.h"

‎Modules/_ctypes/malloc_closure.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef Py_BUILD_CORE_BUILTIN
2+
# define Py_BUILD_CORE_MODULE 1
3+
#endif
14
#include <Python.h>
25
#include <ffi.h>
36
#ifdef MS_WIN32

0 commit comments

Comments
 (0)
0