@@ -948,7 +948,7 @@ index 734b6321e5a..b709e511afa 100644
948948
949949 url = 'https://docs.python.org/'
950950diff --git a/Doc/tools/extensions/pyspecific.py b/Doc/tools/extensions/pyspecific.py
951- index c71ad641d7c..638bee626ae 100644
951+ index 80982d56651..024a44f0e12 100644
952952--- a/Doc/tools/extensions/pyspecific.py
953953+++ b/Doc/tools/extensions/pyspecific.py
954954@@ -139,7 +139,7 @@
@@ -4295,7 +4295,7 @@ index 00000000000..2ccb22b9482
42954295@@ -0,0 +1 @@
42964296+# No compliance patching required.
42974297diff --git a/Makefile.pre.in b/Makefile.pre.in
4298- index acecc68e7f6..954e464ee7f 100644
4298+ index 88a6ea80d6c..a9ad677008b 100644
42994299--- a/Makefile.pre.in
43004300+++ b/Makefile.pre.in
43014301@@ -175,18 +175,29 @@
@@ -4338,7 +4338,7 @@ index acecc68e7f6..954e464ee7f 100644
43384338
43394339 ##########################################################################
43404340 # Parser
4341- @@ -589 ,7 +602 ,7 @@
4341+ @@ -590 ,7 +603 ,7 @@
43424342
43434343 # Default target
43444344 all: @DEF_MAKE_ALL_RULE@
@@ -4347,7 +4347,7 @@ index acecc68e7f6..954e464ee7f 100644
43474347 gdbhooks Programs/_testembed python-config
43484348 build_wasm: check-clean-src $(BUILDPYTHON) platform oldsharedmods python-config
43494349
4350- @@ -608 ,6 +621 ,16 @@
4350+ @@ -609 ,6 +622 ,16 @@
43514351 exit 1; \
43524352 fi
43534353
@@ -4364,7 +4364,7 @@ index acecc68e7f6..954e464ee7f 100644
43644364 # Profile generation build must start from a clean tree.
43654365 profile-clean-stamp:
43664366 $(MAKE) clean
4367- @@ -769 ,7 +792 ,7 @@
4367+ @@ -770 ,7 +793 ,7 @@
43684368 $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
43694369
43704370 libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
@@ -4373,7 +4373,7 @@ index acecc68e7f6..954e464ee7f 100644
43734373
43744374
43754375 libpython$(VERSION).sl: $(LIBRARY_OBJS)
4376- @@ -793 ,14 +816 ,13 @@
4376+ @@ -794 ,14 +817 ,13 @@
43774377 # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
43784378 # minimal framework (not including the Lib directory and such) in the current
43794379 # directory.
@@ -4390,7 +4390,7 @@ index acecc68e7f6..954e464ee7f 100644
43904390 -compatibility_version $(VERSION) \
43914391 -current_version $(VERSION) \
43924392 -framework CoreFoundation $(LIBS);
4393- @@ -812 ,6 +834 ,21 @@
4393+ @@ -813 ,6 +835 ,21 @@
43944394 $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(PYTHONFRAMEWORKDIR)/$(PYTHONFRAMEWORK)
43954395 $(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
43964396
@@ -4412,7 +4412,7 @@ index acecc68e7f6..954e464ee7f 100644
44124412 # This rule builds the Cygwin Python DLL and import library if configured
44134413 # for a shared core library; otherwise, this rule is a noop.
44144414 $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
4415- @@ -1717 ,6 +1754 ,36 @@
4415+ @@ -1721 ,6 +1758 ,36 @@
44164416 $(RUNSHARED) /usr/libexec/oah/translate \
44174417 ./$(BUILDPYTHON) -E -m test -j 0 -u all $(TESTOPTS)
44184418
@@ -4449,7 +4449,7 @@ index acecc68e7f6..954e464ee7f 100644
44494449 # Like testall, but with only one pass and without multiple processes.
44504450 # Run an optional script to include information about the build environment.
44514451 buildbottest: all
4452- @@ -1753 ,7 +1820 ,7 @@
4452+ @@ -1757 ,7 +1824 ,7 @@
44534453 # prevent race conditions with PGO builds. PGO builds use recursive make,
44544454 # which can lead to two parallel `./python setup.py build` processes that
44554455 # step on each others toes.
@@ -4458,7 +4458,7 @@ index acecc68e7f6..954e464ee7f 100644
44584458 if test "x$(ENSUREPIP)" != "xno" ; then \
44594459 case $(ENSUREPIP) in \
44604460 upgrade) ensurepip="--upgrade" ;; \
4461- @@ -2150 ,7 +2217 ,16 @@
4461+ @@ -2154 ,7 +2221 ,16 @@
44624462 $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
44634463 $(DESTDIR)$(LIBDEST)/distutils/tests ; \
44644464 fi
@@ -4476,7 +4476,7 @@ index acecc68e7f6..954e464ee7f 100644
44764476 $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
44774477 -j0 -d $(LIBDEST) -f \
44784478 -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
4479- @@ -2297 ,12 +2373 ,16 @@
4479+ @@ -2301 ,12 +2377 ,16 @@
44804480
44814481 # Install the dynamically loadable modules
44824482 # This goes into $(exec_prefix)
@@ -4494,7 +4494,7 @@ index acecc68e7f6..954e464ee7f 100644
44944494 -rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py
44954495 -rm -r $(DESTDIR)$(DESTSHARED)/__pycache__
44964496
4497- @@ -2322 ,9 +2402 ,11 @@
4497+ @@ -2326 ,9 +2406 ,11 @@
44984498 # automatically set prefix to the location deep down in the framework, so we
44994499 # only have to cater for the structural bits of the framework.
45004500
@@ -4508,7 +4508,7 @@ index acecc68e7f6..954e464ee7f 100644
45084508 @if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
45094509 echo Not configured with --enable-framework; \
45104510 exit 1; \
4511- @@ -2345 ,6 +2427 ,30 @@
4511+ @@ -2349 ,6 +2431 ,30 @@
45124512 $(LN) -fsn Versions/Current/Resources $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Resources
45134513 $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
45144514
@@ -4539,7 +4539,7 @@ index acecc68e7f6..954e464ee7f 100644
45394539 # This installs Mac/Lib into the framework
45404540 # Install a number of symlinks to keep software that expects a normal unix
45414541 # install (which includes python-config) happy.
4542- @@ -2379 ,6 +2485 ,19 @@
4542+ @@ -2383 ,6 +2489 ,19 @@
45434543 frameworkinstallextras:
45444544 cd Mac && $(MAKE) installextras DESTDIR="$(DESTDIR)"
45454545
@@ -4559,7 +4559,7 @@ index acecc68e7f6..954e464ee7f 100644
45594559 # Build the toplevel Makefile
45604560 Makefile.pre: $(srcdir)/Makefile.pre.in config.status
45614561 CONFIG_FILES=Makefile.pre CONFIG_HEADERS= $(SHELL) config.status
4562- @@ -2483 ,6 +2602 ,10 @@
4562+ @@ -2487 ,6 +2606 ,10 @@
45634563 -find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
45644564 -rm -f Include/pydtrace_probes.h
45654565 -rm -f profile-gen-stamp
@@ -4570,7 +4570,7 @@ index acecc68e7f6..954e464ee7f 100644
45704570
45714571 profile-removal:
45724572 find . -name '*.gc??' -exec rm -f {} ';'
4573- @@ -2504 ,6 +2627 ,8 @@
4573+ @@ -2508 ,6 +2631 ,8 @@
45744574 config.cache config.log pyconfig.h Modules/config.c
45754575 -rm -rf build platform
45764576 -rm -rf $(PYTHONFRAMEWORKDIR)
@@ -4579,7 +4579,7 @@ index acecc68e7f6..954e464ee7f 100644
45794579 -rm -f python-config.py python-config
45804580
45814581 # Make things extra clean, before making a distribution:
4582- @@ -2584 ,7 +2709 ,7 @@
4582+ @@ -2588 ,7 +2713 ,7 @@
45834583 .PHONY: all build_all build_wasm sharedmods check-clean-src oldsharedmods test quicktest
45844584 .PHONY: install altinstall oldsharedinstall bininstall altbininstall
45854585 .PHONY: maninstall libinstall inclinstall libainstall sharedinstall
0 commit comments