diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 371ac0fe12..62ca9ed685 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -268,6 +268,10 @@ jobs:
libtool \
nasm
+ # Workaround for missing distutils on macOS: https://github.com/actions/runner/issues/2958
+ - name: Install setuptools
+ run: sudo -H pip install setuptools
+
- name: Setup NuGet
run: |
nuget sources add \
diff --git a/Scripts/Ports/python3/openssl.props.in b/Scripts/Ports/python3/openssl.props.in
index 1d404ad57c..697185cf9f 100644
--- a/Scripts/Ports/python3/openssl.props.in
+++ b/Scripts/Ports/python3/openssl.props.in
@@ -10,5 +10,14 @@
${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies)
+
+ Crypt32.lib;ws2_32.lib;%(AdditionalDependencies)
+
+ ${CRYPTO_RELEASE};${SSL_RELEASE};%(AdditionalDependencies)
+
+
+ ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies)
+
+
diff --git a/Scripts/Ports/python3/portfile.cmake b/Scripts/Ports/python3/portfile.cmake
index 7da8f1b1db..1951f3c23a 100644
--- a/Scripts/Ports/python3/portfile.cmake
+++ b/Scripts/Ports/python3/portfile.cmake
@@ -97,8 +97,8 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
find_library(CRYPTO_DEBUG NAMES libcrypto PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(EXPAT_RELEASE NAMES libexpat libexpatMD libexpatMT PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(EXPAT_DEBUG NAMES libexpatd libexpatdMD libexpatdMT PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
- find_library(FFI_RELEASE NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
- find_library(FFI_DEBUG NAMES libffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+ find_library(FFI_RELEASE NAMES ffi PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+ find_library(FFI_DEBUG NAMES ffi PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(LZMA_RELEASE NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
find_library(LZMA_DEBUG NAMES lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
find_library(SQLITE_RELEASE NAMES sqlite3 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
diff --git a/Scripts/Ports/python3/python_vcpkg.props.in b/Scripts/Ports/python3/python_vcpkg.props.in
index e5b6093a51..d9b17cf745 100644
--- a/Scripts/Ports/python3/python_vcpkg.props.in
+++ b/Scripts/Ports/python3/python_vcpkg.props.in
@@ -8,11 +8,6 @@
%(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include
-
- MultiThreadedDebug
- MultiThreaded
- MultiThreadedDebugDLL
- MultiThreadedDLL
@@ -36,6 +31,23 @@
MachineX86
MachineX64
+ MachineARM
+
+
+
+ ${ZLIB_RELEASE};%(AdditionalDependencies)
+
+
+ ${ZLIB_DEBUG};%(AdditionalDependencies)
+
+
+
+
+ ${BZ2_RELEASE};${EXPAT_RELEASE};${FFI_RELEASE};${LZMA_RELEASE};${SQLITE_RELEASE};%(AdditionalDependencies)
+
+
+ ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies)
+
diff --git a/Scripts/Ports/python3/vcpkg.json b/Scripts/Ports/python3/vcpkg.json
index 3155ed36e4..3741e60813 100644
--- a/Scripts/Ports/python3/vcpkg.json
+++ b/Scripts/Ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "python3",
"version": "3.10.7",
- "port-version": 8,
+ "port-version": 9,
"description": "The Python programming language",
"homepage": "https://github.com/python/cpython",
"license": "Python-2.0",
diff --git a/vcpkg b/vcpkg
index 9edb1b8e59..a42af01b72 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 9edb1b8e590cc086563301d735cae4b6e732d2d2
+Subproject commit a42af01b72c28a8e1d7b48107b33e4f286a55ef6
diff --git a/vcpkg.json b/vcpkg.json
index 64d687b3a0..ddfe06d95e 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -59,7 +59,7 @@
]
}
},
- "builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
+ "builtin-baseline": "a42af01b72c28a8e1d7b48107b33e4f286a55ef6",
"vcpkg-configuration": {
"overlay-ports": ["./Scripts/Ports"],
"overlay-triplets": ["./Scripts/Triplets"]