Skip to content

Conversation

@tiran
Copy link
Member

@tirantiran commented Oct 22, 2021

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

https://bugs.python.org/issue43974

``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``. Signed-off-by: Christian Heimes <christian@python.org>
Makefile and makesetup already define ``Py_BUILD_CORE_BUILTIN`` and include ``Modules/internal`` for us.
@tirantiran marked this pull request as ready for review October 22, 2021 12:50
Copy link
Member

@vstinnervstinner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I compared the list of modified files to setup.py. It seems like the PR is exhausitve.

Oh. I didn't know that Modules/makesetup already uses the correct flags for build C extensions depending if it's before or after *shared* in Modules/Setup:

PY_BUILTIN_MODULE_CFLAGS= $(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE_BUILTIN PY_CORE_CFLAGS= $(PY_STDMODULE_CFLAGS) -DPy_BUILD_CORE 

@@ -0,0 +1,2 @@
``setup.py`` no longer defines ``Py_BUILD_CORE_MODULE``. Instead every
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may also mention Modules/Setup.

Copy link
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. I didn't know that Modules/makesetup already uses the correct flags for build C extensions depending if it's before or after *shared* in Modules/Setup:

There is a problem with *shared*. I created https://bugs.python.org/issue45571 to track the issue.

@tirantiran changed the title bpo-43974: Move Py_BUILD_CORE_MODULE into module codebpo-43974: Move Py_BUILD_CORE_MODULE into module code (GH-29157)Oct 22, 2021
@tirantiran merged commit 03e9f5d into python:mainOct 22, 2021
@tirantiran deleted the bpo-43974-2 branch October 22, 2021 13:36
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@tiran@vstinner@the-knights-who-say-ni@bedevere-bot