[gmp/nettle] Update to latest release revision (#15236)

5 files changed, 248 insertions, 170 deletions

diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
index e566c45a6..d78d4cc30 100644
--- a/ports/gmp/portfile.cmake
+++ b/ports/gmp/portfile.cmake
@@ -6,13 +6,12 @@ if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_from_github(

         OUT_SOURCE_PATH SOURCE_PATH

         REPO ShiftMediaProject/gmp

-        REF e140dfc8668e96d7e56cbd46467945adcc6b3cc4 #v6.2.0

-        SHA512 3b646c142447946bb4556db01214ff130da917bc149946b8cf086f3b01e1cc3d664b941a30a42608799c14461b2f29e4b894b72915d723bd736513c8914729b7

+        REF 0018c44e8dfcc3b64b43e0aea4b3f419f0b65fd0 #v6.2.1-2

+        SHA512 2405e2536ca9fe0b890f44f54c936ac0e4b5a9ebe6a19e1c48a9c21b7211d2a1b45865852e3c65a98a6735216a4e27bea75c0fd6e52efeed4baecd95da9895a5

         HEAD_REF master

         PATCHES

             vs.build.patch

             runtime.patch

-            prefix.patch

     )

 

     include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)

@@ -33,7 +32,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endif()

 

     #Setup YASM integration

-    set(_file "${SOURCE_PATH}/SMP/libgmp.vcxproj")

+    set(_porjectfile)

+    if(VCPKG_TARGET_IS_UWP)

+        set(_porjectfile "${SOURCE_PATH}/SMP/libgmp_winrt.vcxproj")

+    else()

+        set(_porjectfile "${SOURCE_PATH}/SMP/libgmp.vcxproj")

+    endif()

+    set(_file "${_porjectfile}")

     file(READ "${_file}" _contents)

     string(REPLACE  [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />]]

                      "<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.props\" />"

@@ -42,13 +47,6 @@ if(VCPKG_TARGET_IS_WINDOWS)
                      "<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.targets\" />"

                     _contents "${_contents}")

     string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet

-    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

-        STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}")

-        STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}")

-    else()

-        STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}")

-        STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}")

-    endif()

     file(WRITE "${_file}" "${_contents}")

 

     vcpkg_install_msbuild(

@@ -65,7 +63,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     )

     get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)

     file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include")

-    set(PACKAGE_VERSION 6.2.0)

+    set(PACKAGE_VERSION 6.2.1)

     set(PACKAGE_NAME gmp)

     set(prefix "${CURRENT_INSTALLED_DIR}")

     set(exec_prefix "\${prefix}")

@@ -85,20 +83,20 @@ if(VCPKG_TARGET_IS_WINDOWS)
 else()

     vcpkg_download_distfile(

         ARCHIVE

-        URLS https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz

-        FILENAME gmp-6.2.0.tar.xz

-        SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c)

+        URLS https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz

+        FILENAME gmp-6.2.1.tar.xz

+        SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84

+    )

 

     vcpkg_extract_source_archive_ex(

         OUT_SOURCE_PATH SOURCE_PATH

         ARCHIVE ${ARCHIVE}

-        REF gmp-6.2.0

+        REF gmp-6.2.1

     )

 

     vcpkg_configure_make(

         SOURCE_PATH ${SOURCE_PATH}

         AUTOCONFIG

-        OPTIONS ${OPTIONS}

     )

 

     vcpkg_install_make()

@@ -106,6 +104,5 @@ else()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/")

     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

-    # # Handle copyright

     file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

 endif()

diff --git a/ports/gmp/prefix.patch b/ports/gmp/prefix.patch
deleted file mode 100644
index 611c73763..000000000
--- a/ports/gmp/prefix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
-index 2c5b8cdc6..157215394 100644
---- a/SMP/libgmp.vcxproj	
-+++ b/SMP/libgmp.vcxproj
-@@ -1574,14 +1574,14 @@
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmpd</TargetName>
-+    <TargetName>gmpd</TargetName>
-     <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmpd</TargetName>
-+    <TargetName>gmpd</TargetName>
-     <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
-@@ -1630,14 +1630,14 @@
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmp</TargetName>
-+    <TargetName>gmp</TargetName>
-     <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmp</TargetName>
-+    <TargetName>gmp</TargetName>
-     <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch
index b2f15d260..f219e3dc7 100644
--- a/ports/gmp/runtime.patch
+++ b/ports/gmp/runtime.patch
@@ -1,68 +1,180 @@
-diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
-index 3c774be11..e8919240b 100644
---- a/SMP/libgmp.vcxproj	
-+++ b/SMP/libgmp.vcxproj
-@@ -1846,6 +1846,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+diff --git a/SMP/smp.props b/SMP/smp.props
+index fc70bd8..d515523 100644
+--- a/SMP/smp.props
++++ b/SMP/smp.props
+@@ -86,7 +86,7 @@
+   </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+-    <TargetName>lib$(RootNamespace)d</TargetName>
++    <TargetName>$(RootNamespace)d</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -94,7 +94,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>lib$(RootNamespace)d</TargetName>
++    <TargetName>$(RootNamespace)d</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -118,7 +118,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+-    <TargetName>lib$(RootNamespace)</TargetName>
++    <TargetName>$(RootNamespace)</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -126,7 +126,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>lib$(RootNamespace)</TargetName>
++    <TargetName>$(RootNamespace)</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -159,6 +159,7 @@
+       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
        <MinimalRebuild>false</MinimalRebuild>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      </ClCompile>
      <Lib>
-       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-@@ -1929,6 +1930,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+@@ -177,6 +178,7 @@
+       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
+       <MinimalRebuild>false</MinimalRebuild>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <SDLCheck>false</SDLCheck>
 +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      </ClCompile>
      <Lib>
        <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-@@ -2190,6 +2192,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+@@ -196,6 +198,7 @@
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
        <MinimalRebuild>false</MinimalRebuild>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      </ClCompile>
      <Link>
-       <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
-@@ -2278,6 +2281,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
+@@ -219,6 +222,7 @@
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+       <MinimalRebuild>false</MinimalRebuild>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <SDLCheck>false</SDLCheck>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      </ClCompile>
      <Link>
        <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
-@@ -2549,6 +2553,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
-       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
+@@ -248,6 +252,7 @@
+       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
+       <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      </ClCompile>
      <Lib>
-       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-@@ -2638,6 +2643,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
+@@ -273,6 +278,7 @@
+       <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
+       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <SDLCheck>false</SDLCheck>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      </ClCompile>
      <Lib>
        <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
-@@ -2916,6 +2922,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+@@ -297,6 +303,7 @@
+       <AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      </ClCompile>
      <Link>
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
-@@ -3011,6 +3018,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+@@ -328,6 +335,7 @@
+       <AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
-       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-       <SDLCheck>false</SDLCheck>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      </ClCompile>
      <Link>
        <EnableCOMDATFolding>true</EnableCOMDATFolding>
+diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
+index cb5f090..19b2b8d 100644
+--- a/SMP/smp_winrt.props
++++ b/SMP/smp_winrt.props
+@@ -97,7 +97,7 @@
+   </ImportGroup>
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
+-    <TargetName>lib$(RootNamespace)d_winrt</TargetName>
++    <TargetName>l$(RootNamespace)d</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -105,7 +105,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
+-    <TargetName>lib$(RootNamespace)d_winrt</TargetName>
++    <TargetName>$(RootNamespace)d</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -113,7 +113,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
+-    <TargetName>$(RootNamespace)d_winrt</TargetName>
++    <TargetName>$(RootNamespace)d</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -121,7 +121,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
+-    <TargetName>$(RootNamespace)d_winrt</TargetName>
++    <TargetName>$(RootNamespace)d</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -129,7 +129,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
+-    <TargetName>lib$(RootNamespace)_winrt</TargetName>
++    <TargetName>$(RootNamespace)</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -137,7 +137,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
+-    <TargetName>lib$(RootNamespace)_winrt</TargetName>
++    <TargetName>$(RootNamespace)</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -145,7 +145,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
+-    <TargetName>$(RootNamespace)_winrt</TargetName>
++    <TargetName>$(RootNamespace)</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
+@@ -153,7 +153,7 @@
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
+-    <TargetName>$(RootNamespace)_winrt</TargetName>
++    <TargetName>$(RootNamespace)</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json
index a0c93f2ab..19f916179 100644
--- a/ports/gmp/vcpkg.json
+++ b/ports/gmp/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "gmp",
-  "version-string": "6.2.0",
-  "port-version": 5,
+  "version-string": "6.2.1-2",
   "description": "The GNU Multiple Precision Arithmetic Library",
   "homepage": "https://gmplib.org",
+  "supports": "windows & !(arm | arm64)",
   "dependencies": [
     {
       "name": "vs-yasm",
diff --git a/ports/gmp/vs.build.patch b/ports/gmp/vs.build.patch
index 69aba9939..4c04d0c16 100644
--- a/ports/gmp/vs.build.patch
+++ b/ports/gmp/vs.build.patch
@@ -1,151 +1,158 @@
-diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
-index b4e06ae42..442d82c51 100644
---- a/SMP/libgmp.vcxproj	
-+++ b/SMP/libgmp.vcxproj
-@@ -1559,114 +1559,114 @@
-   </ImportGroup>
+diff --git a/SMP/smp.props b/SMP/smp.props
+index e2ed214..fc70bd8 100644
+--- a/SMP/smp.props
++++ b/SMP/smp.props
+@@ -87,7 +87,7 @@
    <PropertyGroup Label="UserMacros" />
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+     <TargetName>lib$(RootNamespace)d</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmpd</TargetName>
-+    <TargetName>gmpd</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -95,7 +95,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+     <TargetName>lib$(RootNamespace)d</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmpd_winrt</TargetName>
-+    <TargetName>gmpd</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -103,7 +103,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
-     <TargetName>libgmpd</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
+     <TargetName>$(RootNamespace)d</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -111,7 +111,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmpd_winrt</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
+     <TargetName>$(RootNamespace)d</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+    <TargetName>libgmpd</TargetName>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -119,7 +119,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+     <TargetName>lib$(RootNamespace)</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
-     <TargetName>gmpd</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -127,7 +127,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+     <TargetName>lib$(RootNamespace)</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>gmpd_winrt</TargetName>
-+    <TargetName>gmpd</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -135,7 +135,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
-     <TargetName>gmpd</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
+     <TargetName>$(RootNamespace)</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -143,7 +143,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>gmpd_winrt</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
+     <TargetName>$(RootNamespace)</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+    <TargetName>gmpd</TargetName>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
-   </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
+index 9b453a5..cb5f090 100644
+--- a/SMP/smp_winrt.props
++++ b/SMP/smp_winrt.props
+@@ -98,7 +98,7 @@
+   <PropertyGroup Label="UserMacros" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
+     <TargetName>lib$(RootNamespace)d_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--     <TargetName>libgmp</TargetName>
-+     <TargetName>gmp</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -106,7 +106,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
+     <TargetName>lib$(RootNamespace)d_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmp_winrt</TargetName>
-+    <TargetName>gmp</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -114,7 +114,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
-     <TargetName>libgmp</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
+     <TargetName>$(RootNamespace)d_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -122,7 +122,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>libgmp_winrt</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
+     <TargetName>$(RootNamespace)d_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+    <TargetName>libgmp</TargetName>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -130,7 +130,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
+     <TargetName>lib$(RootNamespace)_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
-     <TargetName>gmp</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -138,7 +138,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
+     <TargetName>lib$(RootNamespace)_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>gmp_winrt</TargetName>
-+    <TargetName>gmp</TargetName>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -146,7 +146,7 @@
    </PropertyGroup>
-   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
-     <TargetName>gmp</TargetName>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
+     <TargetName>$(RootNamespace)_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -154,7 +154,7 @@
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
-     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
--    <TargetName>gmp_winrt</TargetName>
+     <TargetName>$(RootNamespace)_winrt</TargetName>
 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
-+    <TargetName>gmp</TargetName>
 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+     <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
-     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
-   </PropertyGroup>
 diff --git a/gmp.pc.in b/gmp.pc.in
-index bf1c799ad..d0c81be91 100644
---- a/gmp.pc.in	
+index bf1c799..d0c81be 100644
+--- a/gmp.pc.in
 +++ b/gmp.pc.in
 @@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
  URL: https://gmplib.org
@@ -154,8 +161,8 @@ index bf1c799ad..d0c81be91 100644
 -Libs: -L${libdir} -lgmp
 +Libs: -L${libdir} @LIBS@
 diff --git a/gmpxx.pc.in b/gmpxx.pc.in
-index 181cc70c6..2b697ceab 100644
---- a/gmpxx.pc.in	
+index 181cc70..2b697ce 100644
+--- a/gmpxx.pc.in
 +++ b/gmpxx.pc.in
 @@ -9,4 +9,4 @@ URL: https://gmplib.org
  Version: @PACKAGE_VERSION@