diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-12-28 11:26:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 11:26:40 -0800 |
| commit | da09069999fa7632372ee41051d00823940fd4f9 (patch) | |
| tree | 8bc16021b963fd767f31bec724eb9d2ec1505c4a /ports/gmp/runtime.patch | |
| parent | 445a333466467ffd79ab538c220b3719836b0af6 (diff) | |
| download | vcpkg-da09069999fa7632372ee41051d00823940fd4f9.tar.gz vcpkg-da09069999fa7632372ee41051d00823940fd4f9.zip | |
[gmp/nettle] Update to latest release revision (#15236)
Diffstat (limited to 'ports/gmp/runtime.patch')
| -rw-r--r-- | ports/gmp/runtime.patch | 168 |
1 files changed, 140 insertions, 28 deletions
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> |