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

  1. python
  2. cpython

Repository navigation

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 2 commits into from
Dec 6, 2021
Conversation 3 Commits 2 Checks 0 Files changed
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13e5d43
bpo-45950: Attempt to fix macOS builds of _bootstrap_python when usin…
tiran Dec 6, 2021
0a3a53c
Allow --with-build-python for all builds again
tiran Dec 6, 2021
File filter

Filter by extension

Filter by extension .ac  (1) .c  (1) .in  (1) No extension  (1) All 4 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
16 changes: 14 additions & 2 deletions Makefile.pre.in
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -954,9 +954,9 @@ BOOTSTRAP_HEADERS = \

Programs/_bootstrap_python.o: Programs/_bootstrap_python.c $(BOOTSTRAP_HEADERS) $(PYTHON_HEADERS)

_bootstrap_python: $(LIBRARY_OBJS_OMIT_FROZEN) Programs/_bootstrap_python.o Modules/getpath.o Modules/Setup.local
_bootstrap_python: $(LIBRARY_OBJS_OMIT_FROZEN) Programs/_bootstrap_python.o Modules/getpath_bootstrap.o Modules/Setup.local
$(LINKCC) $(PY_LDFLAGS_NOLTO) -o $@ $(LIBRARY_OBJS_OMIT_FROZEN) \
Programs/_bootstrap_python.o Modules/getpath.o $(LIBS) $(MODLIBS) $(SYSLIBS)
Programs/_bootstrap_python.o Modules/getpath_bootstrap.o $(LIBS) $(MODLIBS) $(SYSLIBS)

############################################################################
# Deepfreeze targets
Expand Down Expand Up @@ -1205,6 +1205,18 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h M
-DPLATLIBDIR='"$(PLATLIBDIR)"' \
-o $@ $(srcdir)/Modules/getpath.c

# 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
Comment on lines +1208 to +1217

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"

tiran Dec 7, 2021

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

cpython/Modules/getpath.c

Lines 24 to 28 in ddbab69

#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



Programs/python.o: $(srcdir)/Programs/python.c
$(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c

Expand Down
3 changes: 2 additions & 1 deletion Modules/getpath.c
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ library_to_dict(PyObject *dict, const char *key)
if (PyWin_DLLhModule) {
return winmodule_to_dict(dict, key, PyWin_DLLhModule);
}
#elif defined(WITH_NEXT_FRAMEWORK)
#elif defined(WITH_NEXT_FRAMEWORK) && !defined(PY_BOOTSTRAP_PYTHON)
// _bootstrap_python does not use framework and crashes
static const char modPath[MAXPATHLEN + 1];
static int modPathInitialized = -1;
if (modPathInitialized < 0) {
Expand Down
7 changes: 2 additions & 5 deletions configure
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,7 @@ Optional Packages:
path to _freeze_module binary for cross compiling
--with-build-python=python3.11
path to build python binary for cross compiling
(default: python3.11)
(default: _bootstrap_python or python3.11)
--with-pkg-config=[yes|no|check]
use pkg-config to detect build options (default is
check)
Expand Down Expand Up @@ -3243,14 +3243,11 @@ if test "${with_build_python+set}" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-build-python" >&5
$as_echo_n "checking for --with-build-python... " >&6; }

if test "x$cross_compiling" = xno; then :
as_fn_error $? "--with-build-python only applies to cross compiling" "$LINENO" 5
fi
if test "x$with_build_python" = xyes; then :
with_build_python=python$PACKAGE_VERSION
fi
if test "x$with_build_python" = xno; then :
as_fn_error $? "invalid --with-build-python option: expected path, not \"no\"" "$LINENO" 5
as_fn_error $? "invalid --with-build-python option: expected path or \"yes\", not \"no\"" "$LINENO" 5
fi

if ! $(command -v "$with_build_python" >/dev/null 2>&1); then
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,16 @@ AC_ARG_WITH(
)
AC_SUBST([FREEZE_MODULE])

dnl build-python is used for cross compiling and macOS framework builds.
AC_ARG_WITH(
[build-python],
[AS_HELP_STRING([--with-build-python=python]PYTHON_VERSION,
[path to build python binary for cross compiling (default: python]PYTHON_VERSION[)])],
[path to build python binary for cross compiling (default: _bootstrap_python or python]PYTHON_VERSION[)])],
[
AC_MSG_CHECKING([for --with-build-python])

AS_VAR_IF([cross_compiling], [no], AC_MSG_ERROR([--with-build-python only applies to cross compiling]))
AS_VAR_IF([with_build_python], [yes], [with_build_python=python$PACKAGE_VERSION])
AS_VAR_IF([with_build_python], [no], [AC_MSG_ERROR([invalid --with-build-python option: expected path, not "no"])])
AS_VAR_IF([with_build_python], [no], [AC_MSG_ERROR([invalid --with-build-python option: expected path or "yes", not "no"])])

if ! $(command -v "$with_build_python" >/dev/null 2>&1); then
AC_MSG_ERROR([invalid or missing build python binary "$with_build_python"])
Expand Down
Back | FazBrowse Home | New Git URL