Update vcpkg-tool to 2024-03-14. (#37492)

https://github.com/microsoft/vcpkg-tool/releases/tag/2024-03-14
microsoft · Mar 19, 2024 · 898b728 · 898b728
1 parent ea90335
commit 898b728
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 72 deletions.
diff --git a/ports/linenoise-ng/portfile.cmake b/ports/linenoise-ng/portfile.cmake
diff --git a/ports/linenoise-ng/vcpkg.json b/ports/linenoise-ng/vcpkg.json
diff --git a/ports/nss/03-use-debug-crt-for-debug.patch b/ports/nss/03-use-debug-crt-for-debug.patch
@@ -0,0 +1,13 @@
+diff --git a/nss/coreconf/config.gypi b/nss/coreconf/config.gypi
+index ae4c708..42633fc 100644
+--- a/nss/coreconf/config.gypi
++++ b/nss/coreconf/config.gypi
+@@ -622,7 +622,7 @@
+           'VCCLCompilerTool': {
+             'Optimization': '<(debug_optimization_level)',
+             'BasicRuntimeChecks': '3',
+-            'RuntimeLibrary': '2', # /MD
++            'RuntimeLibrary': '3', # /MDd
+             'DebugInformationFormat': '3',
+           },
+           'VCLinkerTool': {
diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake
@@ -4,7 +4,7 @@ string(REPLACE "." "_" V_URL ${VERSION})
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${VERSION}.tar.gz"
     FILENAME "nss-${VERSION}.tar.gz"
-    SHA512 4f335c5c284eff6424745cc15e32037715a915f6f61687ec36a8ffaef0e45d152602a1be275bbb2f14650c7d258d6488430cdcf512b18ba7cb73cd43ac625681
+    SHA512 4f335c5c284eff6424745cc15e32037715a915f6f61687ec36a8ffaef0e45d152602a1be275bbb2f14650c7d258d6488430cdcf512b18ba7cb73cd43ac625681
 )
 
 vcpkg_extract_source_archive(
@@ -14,6 +14,7 @@ vcpkg_extract_source_archive(
     PATCHES
         "01-nspr-no-lib-prefix.patch"
         "02-gen-debug-info-for-release.patch"
+        "03-use-debug-crt-for-debug.patch" # See https://learn.microsoft.com/dotnet/api/microsoft.visualstudio.vcprojectengine.runtimelibraryoption
 )
 
 # setup mozbuild for windows

diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "nss",
   "version": "3.98",
+  "port-version": 1,
   "description": "Network Security Services from Mozilla",
   "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/",
   "license": "MPL-2.0",

diff --git a/ports/simd/portfile.cmake b/ports/simd/portfile.cmake
@@ -8,11 +8,11 @@ vcpkg_from_github(
 
 if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64"))
   if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
-  	set(SIMD_PLATFORM "Win32")
+    set(SIMD_PLATFORM "Win32")
   elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-  	set(SIMD_PLATFORM "x64")
+    set(SIMD_PLATFORM "x64")
   endif()
-  
+
   if(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
     set(SOLUTION_TYPE vs2015)
   elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
@@ -22,37 +22,38 @@ if(VCPKG_TARGET_IS_WINDOWS AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPK
   else()
     set(SOLUTION_TYPE vs2022)
   endif()
-   
+
   if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string("${SOURCE_PATH}/src/Simd/SimdConfig.h"
-	    "//#define SIMD_STATIC"
-	    "#define SIMD_STATIC")
+      "//#define SIMD_STATIC"
+      "#define SIMD_STATIC")
     vcpkg_replace_string("${SOURCE_PATH}/prj/${SOLUTION_TYPE}/Simd.vcxproj"
-	     "<ConfigurationType>DynamicLibrary</ConfigurationType>"
-		 "<ConfigurationType>StaticLibrary</ConfigurationType>")
+       "<ConfigurationType>DynamicLibrary</ConfigurationType>"
+     "<ConfigurationType>StaticLibrary</ConfigurationType>")
     file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj")
     foreach(PROJ_FILE ${PROJ_FILES})
         vcpkg_replace_string(${PROJ_FILE}
           "    </ClCompile>"
           "      <DebugInformationFormat>OldStyle</DebugInformationFormat>\n    </ClCompile>")
     endforeach()
-    if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-	  file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj")
-	  foreach(PROJ_FILE ${PROJ_FILES})
+  endif()
+
+  if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+    file(GLOB_RECURSE PROJ_FILES "${SOURCE_PATH}/prj/${SOLUTION_TYPE}/*.vcxproj")
+    foreach(PROJ_FILE ${PROJ_FILES})
         vcpkg_replace_string(${PROJ_FILE}
-	      "    </ClCompile>"
-	      "      <RuntimeLibrary Condition=\"'$(Configuration)'=='Debug'\">MultiThreadedDebugDLL</RuntimeLibrary>\n      <RuntimeLibrary Condition=\"'$(Configuration)'=='Release'\">MultiThreadedDLL</RuntimeLibrary>\n    </ClCompile>")
-	  endforeach()
-    endif()
+        "    </ClCompile>"
+        "      <RuntimeLibrary Condition=\"'$(Configuration)'=='Debug'\">MultiThreadedDebugDLL</RuntimeLibrary>\n      <RuntimeLibrary Condition=\"'$(Configuration)'=='Release'\">MultiThreadedDLL</RuntimeLibrary>\n    </ClCompile>")
+    endforeach()
   endif()
-  
+
   vcpkg_install_msbuild(
-  	SOURCE_PATH ${SOURCE_PATH}
-  	PROJECT_SUBPATH "/prj/${SOLUTION_TYPE}/Simd.sln"
-  	PLATFORM ${SIMD_PLATFORM}
-  	TARGET Simd
-  	RELEASE_CONFIGURATION "Release"
-  	DEBUG_CONFIGURATION "Debug"
+    SOURCE_PATH ${SOURCE_PATH}
+    PROJECT_SUBPATH "/prj/${SOLUTION_TYPE}/Simd.sln"
+    PLATFORM ${SIMD_PLATFORM}
+    TARGET Simd
+    RELEASE_CONFIGURATION "Release"
+    DEBUG_CONFIGURATION "Debug"
   )
   vcpkg_copy_pdbs()
   file(GLOB SIMD_HEADERS "${SOURCE_PATH}/src/Simd/*.hpp" "${SOURCE_PATH}/src/Simd/*.h")
@@ -63,13 +64,13 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
   else()
     vcpkg_cmake_configure(
       SOURCE_PATH "${SOURCE_PATH}/prj/cmake"
-	  OPTIONS
-	    -DSIMD_TARGET="aarch64"
+    OPTIONS
+      -DSIMD_TARGET="aarch64"
     )
     vcpkg_cmake_install()
     vcpkg_cmake_config_fixup()
     vcpkg_copy_pdbs()
-  
+
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
   endif()
 else()
@@ -79,9 +80,8 @@ else()
   vcpkg_cmake_install()
   vcpkg_cmake_config_fixup()
   vcpkg_copy_pdbs()
-  
+
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 endif()
 
-# Handle copyright
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/simd/vcpkg.json b/ports/simd/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "simd",
   "version": "5.3.128",
+  "port-version": 1,
   "description": "Simd image processing and machine learning library, designed for C and C++ programmers",
   "homepage": "https://github.com/ermig1979/Simd",
   "license": "MIT",

diff --git a/scripts/vcpkg-tool-metadata.txt b/scripts/vcpkg-tool-metadata.txt
@@ -1,5 +1,5 @@
-VCPKG_TOOL_RELEASE_TAG=2024-02-07
-VCPKG_MACOS_SHA=c50da3ecce49c7ec4dd2e1f487d5c501ecd7e6799e480a88866545c5c93dbe1019abb8cbe63a442277d521874c0dec33337ee8f12f2643b99ff01ea18d6c70a9
-VCPKG_MUSLC_SHA=5f09fae7cd1410b4ab4ea20a33135c2d2401b08e4f67b96bad3a96d0c0d24da8cd661e900047f06aa5d8c4092423cbbdf5034e7f2000d3be38741be61c9b78e5
-VCPKG_GLIBC_SHA=ee0bc610703e8e7f39f1382590f25787c99f723fb02fb994a03a709a78277f8f1ad3188b23b99fb21551234d9f57e1caf706c82968e082d2fe8298e286c36461
-VCPKG_TOOL_SOURCE_SHA=47b2e6f401d5504240f15067c3f21947a029577dc46ed88354ced5e177523bfef13ad129a0d228ddf42e534474bf746f7fa0b11104ad6a35fd8783b1229a2c79
+VCPKG_TOOL_RELEASE_TAG=2024-03-14
+VCPKG_MACOS_SHA=d9acaea52a459fffd64e5fddda0364e229480379995baab5839d15b0d7b75870d1b50f62127ccc2a02a6056408dc4af2258f0cafa399ed52fe7dbf2e944e4693
+VCPKG_MUSLC_SHA=5f54a8a29ce12e717fb29593ca8377f3c0460cd8112b41ec21333064add8844be45e34ff9bb58db5fec46abe1f436b88bcd1d90b5d416dad01bfd9719a353134
+VCPKG_GLIBC_SHA=73abdb955030dee962d5b964d8c44a3621a92764518b23d3022e97cbb888b1eed66c944036b04fba84f0556dab11279a51f3ae1cfc46687cbab6ded22b259b55
+VCPKG_TOOL_SOURCE_SHA=d28da01818043a84060a0964d0b7849b425e488f90076408c28b5366aa95c8f688b1917059e59ac5b95420bbd9e4b6e7c9a2a24cee1366476e366f9e9b0025f2
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5316,10 +5316,6 @@
       "baseline": "2.2",
       "port-version": 0
     },
-    "linenoise-ng": {
-      "baseline": "4754bee2d8eb3",
-      "port-version": 3
-    },
     "linmath": {
       "baseline": "2022-07-30",
       "port-version": 0
@@ -6170,7 +6166,7 @@
     },
     "nss": {
       "baseline": "3.98",
-      "port-version": 0
+      "port-version": 1
     },
     "nsync": {
       "baseline": "1.26.0",
@@ -8054,7 +8050,7 @@
     },
     "simd": {
       "baseline": "5.3.128",
-      "port-version": 0
+      "port-version": 1
     },
     "simde": {
       "baseline": "0.8.0",

diff --git a/versions/n-/nss.json b/versions/n-/nss.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4ce5ce6e94d2b9179b2f316bce89214afc31e303",
+      "version": "3.98",
+      "port-version": 1
+    },
     {
       "git-tree": "92c9d14f27941f9b37f719a0a16f571e69dd5c88",
       "version": "3.98",

diff --git a/versions/s-/simd.json b/versions/s-/simd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ffd162c11ab46810863df261f1f373ad008af239",
+      "version": "5.3.128",
+      "port-version": 1
+    },
     {
       "git-tree": "a2b30d3025f099db089990aed91ded39c41ffccd",
       "version": "5.3.128",