diff --git a/ports/python3/0008-fix-parallel-install.patch b/ports/python3/0008-fix-parallel-install.patch new file mode 100644 index 00000000000000..26554644c46466 --- /dev/null +++ b/ports/python3/0008-fix-parallel-install.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 790d974..88fc444 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -2019,6 +2019,10 @@ Python/thread.o: @THREADHEADERS@ $(srcdir)/Python/condvar.h + .PHONY: build_all_generate_profile build_all_merge_profile + .PHONY: gdbhooks + ++# Serialize targets which may create /lib ++libinstall: altbininstall ++libainstall: altbininstall ++ + # IF YOU PUT ANYTHING HERE IT WILL GO AWAY + # Local Variables: + # mode: makefile diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 74ceb801ea4038..494703ff4b7d00 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -13,6 +13,7 @@ set(PATCHES 0003-devendor-external-dependencies.patch 0004-dont-copy-vcruntime.patch 0005-only-build-required-projects.patch + 0008-fix-parallel-install.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index b0e20b8f79d5cb..4c16b303273b95 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-semver": "3.10.0", - "port-version": 2, + "port-version": 3, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 24b60f6482f664..62e0f1cf3998ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5466,7 +5466,7 @@ }, "python3": { "baseline": "3.10.0", - "port-version": 2 + "port-version": 3 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index c90ee6f467c378..a382816966c2af 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2b8029e8ffdc1cbbff8a40346ef5fa82c811616", + "version-semver": "3.10.0", + "port-version": 3 + }, { "git-tree": "c8c0f995b8f1831fc7f345329c2ce0a80d717551", "version-semver": "3.10.0",