Merge pull request #1529 from dpogue/vcpkg-2023.11.20

Bump vcpkg to 2023.11.20
H-uru · Nov 27, 2023 · 45bc9b7 · 45bc9b7
2 parents d2d898d + 2541989
commit 45bc9b7
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 10 deletions.
diff --git 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
@@ -10,5 +10,14 @@
         ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies)
       </AdditionalDependencies>
     </Link>
+    <Lib>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExternals)'=='Release|true'">
+        ${CRYPTO_RELEASE};${SSL_RELEASE};%(AdditionalDependencies)
+      </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExternals)'=='Debug|true'">
+        ${CRYPTO_DEBUG};${SSL_DEBUG};%(AdditionalDependencies)
+      </AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
 </Project>
diff --git 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
@@ -8,11 +8,6 @@
       <AdditionalIncludeDirectories>
         %(AdditionalIncludeDirectories);${CURRENT_INSTALLED_DIR}/include
       </AdditionalIncludeDirectories>
-
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Debug'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'static|Release'">MultiThreaded</RuntimeLibrary>
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'dynamic|Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
-      <RuntimeLibrary Condition="'${VCPKG_CRT_LINKAGE}|$(Configuration)' == 'dynamic|Release'">MultiThreadedDLL</RuntimeLibrary>
     </CLCompile>
     <Link>
       <!-- Required Libs -->
@@ -36,6 +31,23 @@
       <!-- Required to prevent linker errors on Visual Studio 2017 with static CRT -->
       <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x86'">MachineX86</TargetMachine>
       <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='x64'">MachineX64</TargetMachine>
+      <TargetMachine Condition="'${VCPKG_TARGET_ARCHITECTURE}'=='arm'">MachineARM</TargetMachine>
+
+      <!-- Required Libs -->
+      <AdditionalDependencies Condition="'$(Configuration)'=='Release'">
+        ${ZLIB_RELEASE};%(AdditionalDependencies)
+      </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)'=='Debug'">
+        ${ZLIB_DEBUG};%(AdditionalDependencies)
+      </AdditionalDependencies>
+
+      <!-- Extension modules -->
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExtensions)' == 'Release|true'">
+        ${BZ2_RELEASE};${EXPAT_RELEASE};${FFI_RELEASE};${LZMA_RELEASE};${SQLITE_RELEASE};%(AdditionalDependencies)
+      </AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(IncludeExtensions)' == 'Debug|true'">
+        ${BZ2_DEBUG};${EXPAT_DEBUG};${FFI_DEBUG};${LZMA_DEBUG};${SQLITE_DEBUG};%(AdditionalDependencies)
+      </AdditionalDependencies>
     </Lib>
   </ItemDefinitionGroup>
 </Project>
diff --git 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
diff --git 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"]