diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-10-06 15:53:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 12:53:06 -0700 |
| commit | 15dab6a7628cb11cc9bea72a5065eeb473099e7c (patch) | |
| tree | f17c5c5e7e364f32a14b2c97e6cd09ffc12d69ad /ports/python3/portfile.cmake | |
| parent | 90e568694e88f423139ddd186288a60bdd7c54c0 (diff) | |
| download | vcpkg-15dab6a7628cb11cc9bea72a5065eeb473099e7c.tar.gz vcpkg-15dab6a7628cb11cc9bea72a5065eeb473099e7c.zip | |
[python3] Upgrade to Python 3.10.0 (#20519)
* [python3] Update to Python 3.10.0rc2 (for testing).
* [python3] Revert trivial patch changes.
* [python3] Bump to 3.10.0 final.
* x-add-version
* update python tools to 3.10.0
* [ecm] Add patch from upstream for Python 3.10.
Remove this on the next release.
* x-add-version
* [python3] Add patch to fix static interpreter.
* x-add-version
Diffstat (limited to 'ports/python3/portfile.cmake')
| -rw-r--r-- | ports/python3/portfile.cmake | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 8967d5a3d..b57de25bb 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -4,8 +4,8 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static endif() set(PYTHON_VERSION_MAJOR 3) -set(PYTHON_VERSION_MINOR 9) -set(PYTHON_VERSION_PATCH 7) +set(PYTHON_VERSION_MINOR 10) +set(PYTHON_VERSION_PATCH 0) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -13,7 +13,6 @@ set(PATCHES 0003-devendor-external-dependencies.patch 0004-dont-copy-vcruntime.patch 0005-only-build-required-projects.patch - 0006-fix-duplicate-symbols.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -22,7 +21,7 @@ endif() # Python 3.9 removed support for Windows 7. This patch re-adds support for Windows 7 and is therefore # required to build this port on Windows 7 itself due to Python using itself in its own build system. if("deprecated-win7-support" IN_LIST FEATURES) - list(APPEND PATCHES 0007-restore-support-for-windows-7.patch) + list(APPEND PATCHES 0006-restore-support-for-windows-7.patch) message(WARNING "Windows 7 support is deprecated and may be removed at any time.") elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1) message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.") @@ -32,7 +31,7 @@ endif() if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_get_windows_sdk(WINSDK_VERSION) if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") - list(APPEND PATCHES "0008-workaround-windows-11-sdk-rc-compiler-error.patch") + list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch") endif() endif() @@ -40,7 +39,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 05de4e485fb6f5f21e4e48fb4d7ec0e9a420fab243cba08663e52b8062f86df3e4f57b8afd49ad94d363ca0972ab85efe132b980a7f84188c82814b6df0ba191 + SHA512 d83e0685c274be09da7833a3c24b7379ae0e43b43c131f11bfaccd5902f6a1c510a3ae67c42471a4281922ead3bd34856608ec47be7dd76ddd734e59906ba03b HEAD_REF master PATCHES ${PATCHES} ) |