Skip to content

Commit 03e9f5d

Browse files
tirantiran
authored
bpo-43974: Move Py_BUILD_CORE_MODULE into module code (GH-29157)
setup.py no longer defines Py_BUILD_CORE_MODULE. Instead every module defines the macro before #include "Python.h" unless Py_BUILD_CORE_BUILTIN is already defined. Py_BUILD_CORE_BUILTIN is defined for every module that is built by Modules/Setup. The PR also simplifies Modules/Setup. Makefile and makesetup already define Py_BUILD_CORE_BUILTIN and include Modules/internal for us. Signed-off-by: Christian Heimes <christian@python.org>
1 parent 86dfb55 commit 03e9f5d

40 files changed

+182
-86
lines changed

‎Misc/NEWS.d/next/Build/2021-10-22-14-00-44.bpo-43974.HHZtbx.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
``setup.py`` no longer defines ``Py_BUILD_CORE_MODULE``. Instead every
2+
module, that uses the internal API, defines the macro.

‎Modules/Setup‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -99,26 +99,26 @@ PYTHONPATH=$(COREPYTHONPATH)
9999
# cannot be built as shared!
100100

101101
_collections _collectionsmodule.c
102-
_abc -DPy_BUILD_CORE_BUILTIN _abc.c
102+
_abc _abc.c
103103
_codecs _codecsmodule.c
104-
_functools -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _functoolsmodule.c
105-
_io -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
106-
_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c # -lintl
107-
_operator -DPy_BUILD_CORE_BUILTIN _operator.c
108-
_signal -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal signalmodule.c
109-
_sre -DPy_BUILD_CORE_BUILTIN _sre.c
104+
_functools _functoolsmodule.c
105+
_io -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
106+
_locale _localemodule.c # -lintl
107+
_operator _operator.c
108+
_signal signalmodule.c
109+
_sre _sre.c
110110
_stat _stat.c
111111
_symtable symtablemodule.c # setup.py can't track the .h file that _symtable depends on.
112-
_thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c
112+
_thread _threadmodule.c
113113
_tracemalloc _tracemalloc.c # See bpo-35053 as to why this is built in.
114114
_weakref _weakref.c
115115
atexit atexitmodule.c
116116
errno errnomodule.c
117117
faulthandler faulthandler.c
118118
itertools itertoolsmodule.c
119-
posix -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal posixmodule.c
119+
posix posixmodule.c
120120
pwd pwdmodule.c
121-
time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
121+
time timemodule.c
122122

123123

124124
# ---
@@ -139,7 +139,7 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
139139

140140
#_asyncio _asynciomodule.c
141141
#_bisect _bisectmodule.c
142-
#_blake2 -DPy_BUILD_CORE_BUILTIN _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
142+
#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
143143
#_codecs_cn cjkcodecs/_codecs_cn.c
144144
#_codecs_hk cjkcodecs/_codecs_hk.c
145145
#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
@@ -150,31 +150,31 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
150150
#_csv _csv.c
151151
#_datetime _datetimemodule.c
152152
#_elementtree -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI -I$(srcdir)/Modules/expat _elementtree.c
153-
#_heapq -DPy_BUILD_CORE_MODULE _heapqmodule.c
154-
#_json -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _json.c
153+
#_heapq _heapqmodule.c
154+
#_json _json.c
155155
#_lsprof _lsprof.c rotatingtree.c
156-
#_md5 -DPy_BUILD_CORE_BUILTIN md5module.c
156+
#_md5 md5module.c
157157
#_multibytecodec cjkcodecs/multibytecodec.c
158158
#_opcode _opcode.c
159-
#_pickle -DPy_BUILD_CORE_MODULE _pickle.c
160-
#_posixsubprocess -DPy_BUILD_CORE_BUILTIN _posixsubprocess.c
161-
#_queue -DPy_BUILD_CORE_MODULE _queuemodule.c
162-
#_random -DPy_BUILD_CORE_MODULE _randommodule.c
163-
#_sha1 -DPy_BUILD_CORE_BUILTIN sha1module.c
164-
#_sha256 -DPy_BUILD_CORE_BUILTIN sha256module.c
165-
#_sha512 -DPy_BUILD_CORE_BUILTIN sha512module.c
166-
#_sha3 -DPy_BUILD_CORE_BUILTIN _sha3/sha3module.c
159+
#_pickle _pickle.c
160+
#_posixsubprocess _posixsubprocess.c
161+
#_queue _queuemodule.c
162+
#_random _randommodule.c
163+
#_sha1 sha1module.c
164+
#_sha256 sha256module.c
165+
#_sha512 sha512module.c
166+
#_sha3 _sha3/sha3module.c
167167
#_statistics _statisticsmodule.c
168-
#_struct -DPy_BUILD_CORE_MODULE _struct.c
168+
#_struct _struct.c
169169
#_typing _typingmodule.c
170-
#_zoneinfo -DPy_BUILD_CORE_MODULE _zoneinfo.c
171-
#array -DPy_BUILD_CORE_MODULE arraymodule.c
170+
#_zoneinfo _zoneinfo.c
171+
#array arraymodule.c
172172
#audioop audioop.c
173-
#binascii -DPy_BUILD_CORE_MODULE binascii.c
174-
#cmath -DPy_BUILD_CORE_MODULE cmathmodule.c _math.c # -lm
175-
#math -DPy_BUILD_CORE_MODULE mathmodule.c _math.c # -lm
173+
#binascii binascii.c
174+
#cmath cmathmodule.c _math.c # -lm
175+
#math mathmodule.c _math.c # -lm
176176
#pyexpat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI -I$(srcdir)/Modules/expat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c
177-
#unicodedata -DPy_BUILD_CORE_BUILTIN unicodedata.c
177+
#unicodedata unicodedata.c
178178

179179
# Modules with some UNIX dependencies -- on by default:
180180
# (If you have a really backward UNIX, select and socket may not be
@@ -286,7 +286,7 @@ time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
286286
# provided by the ncurses library. e.g. on Linux, link with -lncurses
287287
# instead of -lcurses).
288288

289-
#_curses -DPy_BUILD_CORE_MODULE -lcurses -ltermcap _cursesmodule.c
289+
#_curses -lcurses -ltermcap _cursesmodule.c
290290

291291
# Wrapper for the panel library that's part of ncurses and SYSV curses.
292292
#_curses_panel -lpanel -lncurses _curses_panel.c
@@ -305,7 +305,7 @@ xxsubtype xxsubtype.c # Required for the test suite to pass!
305305
#_testbuffer _testbuffer.c
306306
#_testcapi _testcapimodule.c # CANNOT be statically compiled!
307307
#_testimportmultiple _testimportmultiple.c
308-
#_testinternalcapi -DPy_BUILD_CORE_MODULE -I$(srcdir)/Include/internal _testinternalcapi.c
308+
#_testinternalcapi _testinternalcapi.c
309309
#_testmultiphase _testmultiphase.c
310310

311311

‎Modules/_abc.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
/* ABCMeta implementation */
2+
#ifndef Py_BUILD_CORE_BUILTIN
3+
# define Py_BUILD_CORE_MODULE 1
4+
#endif
25

36
#include "Python.h"
47
#include "pycore_moduleobject.h" // _PyModule_GetState()

‎Modules/_asynciomodule.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#ifndef Py_BUILD_CORE_BUILTIN
2+
# define Py_BUILD_CORE_MODULE 1
3+
#endif
4+
15
#include "Python.h"
26
#include "pycore_pyerrors.h" // _PyErr_ClearExcState()
37
#include "pycore_pystate.h" // _PyThreadState_GET()

‎Modules/_blake2/blake2b_impl.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
* The blake2s_impl.c is autogenerated from blake2b_impl.c.
1414
*/
1515

16+
#ifndef Py_BUILD_CORE_BUILTIN
17+
# define Py_BUILD_CORE_MODULE 1
18+
#endif
19+
1620
#include "Python.h"
1721
#include "pycore_strhex.h" // _Py_strhex()
1822

‎Modules/_blake2/blake2module.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
* any warranty. http://creativecommons.org/publicdomain/zero/1.0/
99
*/
1010

11+
#ifndef Py_BUILD_CORE_BUILTIN
12+
# define Py_BUILD_CORE_MODULE 1
13+
#endif
14+
1115
#include "Python.h"
1216

1317
#include "impl/blake2.h"

‎Modules/_blake2/blake2s_impl.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
* The blake2s_impl.c is autogenerated from blake2s_impl.c.
1414
*/
1515

16+
#ifndef Py_BUILD_CORE_BUILTIN
17+
# define Py_BUILD_CORE_MODULE 1
18+
#endif
19+
1620
#include "Python.h"
1721
#include "pycore_strhex.h" // _Py_strhex()
1822

‎Modules/_ctypes/_ctypes.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ bytes(cdata)
9898
* PyCField_Type
9999
*
100100
*/
101+
#ifndef Py_BUILD_CORE_BUILTIN
102+
# define Py_BUILD_CORE_MODULE 1
103+
#endif
101104

102105
#define PY_SSIZE_T_CLEAN
103106

‎Modules/_ctypes/callbacks.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#ifndef Py_BUILD_CORE_BUILTIN
2+
# define Py_BUILD_CORE_MODULE 1
3+
#endif
4+
15
#include "Python.h"
26
// windows.h must be included before pycore internal headers
37
#ifdef MS_WIN32

‎Modules/_ctypes/cfield.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#ifndef Py_BUILD_CORE_BUILTIN
2+
# define Py_BUILD_CORE_MODULE 1
3+
#endif
4+
15
#include "Python.h"
26
// windows.h must be included before pycore internal headers
37
#ifdef MS_WIN32

0 commit comments

Comments
 (0)