Skip to content

gh-122402: Eliminate conflicts between build variants installed to a common prefix #122403

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

gh-122402: Eliminate conflicts between build variants installed to a common prefix #122403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4132db0
Allow builds with different ABIs to be installed to a common prefix b…
ned-deily Jul 25, 2024
3c7f9bc
Simplify bininstall
ned-deily Jul 25, 2024
67ae29f
Merge branch 'main' into avoid-install-overlaps
ned-deily Jul 29, 2024
c031337
Retain link to unsuffixed binary file names for framework builds to n…
ned-deily Jul 29, 2024
7297326
Only install relevant prefix/bin symlinks for framework installs.
ned-deily Jul 29, 2024
c772271
add blurb
ned-deily Jul 29, 2024
e39646c
Merge branch 'main' into avoid-install-overlaps
ned-deily Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 26 additions & 36 deletions Mac/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,19 @@ installunixtools:
fi
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
idle3 \
pydoc3 \
python3 \
python3-config \
idle3$(ABIFLAGS) \
pydoc3$(ABIFLAGS) \
python3$(ABIFLAGS) \
python3$(ABIFLAGS)-config \
; \
do \
rm -f $${fn} ; \
$(LN) -s $(BINDIR)/$${fn} $${fn} ;\
done
-if test "x$(VERSION)" != "x$(LDVERSION)"; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
python$(VERSION)-config \
; \
do \
rm -f $${fn} ;\
$(LN) -s $(BINDIR)/$${fn} $${fn} ;\
done ;\
fi
-if test "x$(LIPO_32BIT_FLAGS)" != "x"; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
python3-32 \
python3-32$(ABIFLAGS) \
; \
do \
rm -f $${fn} ;\
Expand All @@ -95,7 +85,7 @@ installunixtools:
-if test "x$(LIPO_INTEL64_FLAGS)" != "x"; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
python3-intel64 \
python3-intel64$(ABIFLAGS) \
; \
do \
rm -f $${fn} ;\
Expand All @@ -108,8 +98,13 @@ installunixtools:
pip3 \
; \
do \
rm -f $${fn} ;\
$(LN) -s $(BINDIR)/$${fn} $${fn} ;\
if test "x$(VERSION)" != "x$(LDVERSION)"; then \
rm -f $${fn}$(ABIFLAGS) ;\
$(LN) -s $(BINDIR)/$${fn} $${fn}$(ABIFLAGS) ;\
else \
rm -f $${fn} ;\
$(LN) -s $(BINDIR)/$${fn} ;\
fi ;\
done ;\
fi

Expand All @@ -122,29 +117,19 @@ altinstallunixtools:
fi
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
idle$(VERSION) \
pydoc$(VERSION) \
python$(VERSION) \
idle$(LDVERSION) \
pydoc$(LDVERSION) \
python$(LDVERSION) \
python$(LDVERSION)-config \
; \
do \
rm -f $${fn} ;\
$(LN) -s $(BINDIR)/$${fn} $${fn} ;\
done
-if test "x$(VERSION)" != "x$(LDVERSION)"; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
python$(LDVERSION) \
; \
do \
rm -f $${fn} ;\
$(LN) -s $(BINDIR)/$${fn} $${fn} ;\
done ;\
fi
-if test "x$(LIPO_32BIT_FLAGS)" != "x"; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
python$(VERSION)-32 \
python$(LDVERSION)-32 \
; \
do \
rm -f $${fn} ;\
Expand All @@ -154,7 +139,7 @@ altinstallunixtools:
-if test "x$(LIPO_INTEL64_FLAGS)" != "x"; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
python$(VERSION)-intel64 \
python$(LDVERSION)-intel64 \
; \
do \
rm -f $${fn} ;\
Expand All @@ -164,11 +149,16 @@ altinstallunixtools:
-if test "x$(ENSUREPIP)" != "xno" ; then \
cd "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" && \
for fn in \
pip$(VERSION) \
pip \
; \
do \
rm -f $${fn} ;\
$(LN) -s $(BINDIR)/$${fn} $${fn} ;\
if test "x$(VERSION)" != "x$(LDVERSION)"; then \
rm -f $${fn}$(LDVERSION) ;\
$(LN) -s $(BINDIR)/$${fn}$(VERSION) $${fn}$(LDVERSION) ;\
else \
rm -f $${fn}$(VERSION) ;\
$(LN) -s $(BINDIR)/$${fn}$(VERSION) $${fn}$(VERSION) ;\
fi ;\
done ;\
fi

Expand Down
67 changes: 27 additions & 40 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2213,7 +2213,9 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
else \
$(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
fi
-if test "$(VERSION)" != "$(LDVERSION)"; then \
# For framework installs, the unsuffixed binary file name is currently
# needed for getpath.py setting of sys._base_executable for venv's
-if test "$(VERSION)" != "$(LDVERSION)" && test "$(PYTHONFRAMEWORKDIR)" != "no-framework"; then \
if test -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE) -o -h $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
then rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
fi; \
Expand All @@ -2236,16 +2238,16 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
fi; \
fi
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-32$(EXE); \
rm -f $(DESTDIR)$(BINDIR)/python$(LDVERSION)-32$(EXE); \
lipo $(LIPO_32BIT_FLAGS) \
-output $(DESTDIR)$(BINDIR)/python$(VERSION)-32$(EXE) \
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
-output $(DESTDIR)$(BINDIR)/python$(LDVERSION)-32$(EXE) \
$(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
fi
if test "x$(LIPO_INTEL64_FLAGS)" != "x" ; then \
rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-intel64$(EXE); \
rm -f $(DESTDIR)$(BINDIR)/python$(LDVERSION)-intel64$(EXE); \
lipo $(LIPO_INTEL64_FLAGS) \
-output $(DESTDIR)$(BINDIR)/python$(VERSION)-intel64$(EXE) \
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
-output $(DESTDIR)$(BINDIR)/python$(LDVERSION)-intel64$(EXE) \
$(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
fi
# Install macOS debug information (if available)
if test -d "$(BUILDPYTHON).dSYM"; then \
Expand All @@ -2270,40 +2272,25 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORKPYTHONW@
# problems for anything else trying to run 'python3' while we install, particularly
# if we're installing in parallel with -j.
bininstall: commoninstall altbininstall
if test ! -d $(DESTDIR)$(LIBPC); then \
echo "Creating directory $(LIBPC)"; \
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
fi
-if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/python3$(EXE); \
then rm -f $(DESTDIR)$(BINDIR)/python3$(EXE); \
else true; \
fi
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
-if test "$(VERSION)" != "$(LDVERSION)"; then \
rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
rm -f $(DESTDIR)$(LIBPC)/python-$(VERSION).pc; \
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION).pc python-$(VERSION).pc); \
rm -f $(DESTDIR)$(LIBPC)/python-$(VERSION)-embed.pc; \
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION)-embed.pc python-$(VERSION)-embed.pc); \
fi
-rm -f $(DESTDIR)$(BINDIR)/python3-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
-rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-rm -f $(DESTDIR)$(BINDIR)/python3$(ABIFLAGS)$(EXE)
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)$(EXE) python3$(ABIFLAGS)$(EXE))
-rm -f $(DESTDIR)$(BINDIR)/python3$(ABIFLAGS)-config
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python3$(ABIFLAGS)-config)
-rm -f $(DESTDIR)$(LIBPC)/python3$(ABIFLAGS).pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION).pc python3$(ABIFLAGS).pc)
-rm -f $(DESTDIR)$(LIBPC)/python3$(ABIFLAGS)-embed.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(LDVERSION)-embed.pc python3$(ABIFLAGS)-embed.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3$(ABIFLAGS)
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(LDVERSION) idle3$(ABIFLAGS))
-rm -f $(DESTDIR)$(BINDIR)/pydoc3$(ABIFLAGS)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(LDVERSION) pydoc3$(ABIFLAGS))
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \
rm -f $(DESTDIR)$(BINDIR)/python3$(ABIFLAGS)-32$(EXE); \
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-32$(EXE) python3$(ABIFLAGS)-32$(EXE)) \
fi
if test "x$(LIPO_INTEL64_FLAGS)" != "x" ; then \
rm -f $(DESTDIR)$(BINDIR)/python3-intel64$(EXE); \
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-intel64$(EXE) python3-intel64$(EXE)) \
rm -f $(DESTDIR)$(BINDIR)/python3$(ABIFLAGS)-intel64$(EXE); \
(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-intel64$(EXE) python3$(ABIFLAGS)-intel64$(EXE)) \
fi

# Install the versioned manual page
Expand Down Expand Up @@ -2738,8 +2725,8 @@ libainstall: all scripts
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
$(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION)
$(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(LDVERSION)
$(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(LDVERSION)
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Build/2024-07-29-11-04-06.gh-issue-122402.HZAQXX.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Eliminate conflicts between build variants installed to a common prefix.
Loading