FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-45950: Fix macOS framework builds of _bootstrap_python (GH-29936) by tiran · Pull Request #29936 · python/cpython · GitHub

Repository navigation

bpo-45950: Fix macOS framework builds of _bootstrap_python (GH-29936) - #29936

Merged
tiran merged 2 commits into
python:mainfrom
tiran:bpo-45950-macos
Dec 6, 2021
Merged

tiran merged 2 commits into
python:mainfrom
tiran:bpo-45950-macos

Conversation

tiran commented Dec 6, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

Copy link
Copy Markdown

🤖 New build scheduled with the buildbot fleet by @tiran for commit 02dc19dd98f2eaa19c2de25eb5a48dec857fa7b1 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Dec 6, 2021
tiran marked this pull request as ready for review December 6, 2021 14:19
tiran changed the title bpo-45950: Attempt to fix macOS builds of _bootstrap_python when usin… bpo-45950: Fix macOS framework builds of _bootstrap_python (GH-29936) Dec 6, 2021
tiran merged commit 612e59b into python:main Dec 6, 2021
tiran deleted the bpo-45950-macos branch December 6, 2021 16:13
Comment thread Makefile.pre.in
Comment on lines +1208 to +1217
# like getpath.o with additional -DPY_BOOTSTRAP_PYTHON=1
Modules/getpath_bootstrap.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h Makefile $(PYTHON_HEADERS)
$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
-DPREFIX='"$(prefix)"' \
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
-DPLATLIBDIR='"$(PLATLIBDIR)"' \
-DPY_BOOTSTRAP_PYTHON=1 \
-o $@ $(srcdir)/Modules/getpath.c

gvanrossum Dec 7, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Wouldn't it be more elegant to have a two-line file named getpath_bootstrap.c using the default .c.o rule?

#define BOOTSTRAP_PYTHON 1
#include "getpath.c"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I agree that the approach is not elegant. getpath.c requires additional macros

#if (!defined(PREFIX) || !defined(EXEC_PREFIX) \
|| !defined(VERSION) || !defined(VPATH) \
|| !defined(PLATLIBDIR))
#error "PREFIX, EXEC_PREFIX, VERSION, VPATH and PLATLIBDIR macros must be defined"
#endif

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants


Back | FazBrowse Home | New Git URL