Skip to content

Commit bcb6cbd

Browse files
authored
GH-131372: only install build-details.json in the main install (#142269)
* GH-131372: only install build-details.json in the main install Signed-off-by: Filipe Laíns <lains@riseup.net> * Add news Signed-off-by: Filipe Laíns <lains@riseup.net> --------- Signed-off-by: Filipe Laíns <lains@riseup.net>
1 parent 02c085d commit bcb6cbd

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Makefile.pre.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2374,8 +2374,10 @@ multissltest: all
23742374
# prevent race conditions with PGO builds. PGO builds use recursive make,
23752375
# which can lead to two parallel `./python setup.py build` processes that
23762376
# step on each others toes.
2377+
# Only the main install gets a build-details.json.
23772378
.PHONY: install
23782379
install: @FRAMEWORKINSTALLFIRST@ @INSTALLTARGETS@ @FRAMEWORKINSTALLLAST@
2380+
$(INSTALL_DATA) `cat pybuilddir.txt`/build-details.json $(DESTDIR)$(LIBDEST); \
23792381
if test "x$(ENSUREPIP)" != "xno" ; then \
23802382
case $(ENSUREPIP) in \
23812383
upgrade) ensurepip="--upgrade" ;; \
@@ -2828,7 +2830,6 @@ libinstall: all $(srcdir)/Modules/xxmodule.c
28282830
done
28292831
$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py $(DESTDIR)$(LIBDEST); \
28302832
$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfig_vars_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).json $(DESTDIR)$(LIBDEST); \
2831-
$(INSTALL_DATA) `cat pybuilddir.txt`/build-details.json $(DESTDIR)$(LIBDEST); \
28322833
$(INSTALL_DATA) `cat pybuilddir.txt`/_missing_stdlib_info.py $(DESTDIR)$(LIBDEST); \
28332834
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
28342835
@ # If app store compliance has been configured, apply the patch to the
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
``build-details.py`` will only be installed as part of the main install
2+
(``make install``). ``make altinstall`` will no longer include it.

0 commit comments

Comments
 (0)