[gmp/nettle] Update to latest release revision #15236
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,180 @@ | ||
| 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> | ||
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Lib> | ||
| <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> | ||
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Lib> | ||
| <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile> | ||
| @@ -196,6 +198,7 @@ | ||
| <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
| <MinimalRebuild>false</MinimalRebuild> | ||
| <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors> | ||
| + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Link> | ||
| <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile> | ||
| @@ -219,6 +222,7 @@ | ||
| <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
| <MinimalRebuild>false</MinimalRebuild> | ||
| <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors> | ||
| + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Link> | ||
| <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile> | ||
| @@ -248,6 +252,7 @@ | ||
| <InterproceduralOptimization>SingleFile</InterproceduralOptimization> | ||
| <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName> | ||
| <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors> | ||
| + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Lib> | ||
| <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> | ||
| + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Lib> | ||
| <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile> | ||
| @@ -297,6 +303,7 @@ | ||
| <AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
| <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors> | ||
| + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| </ClCompile> | ||
| <Link> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| @@ -328,6 +335,7 @@ | ||
| <AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
| <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors> | ||
| + <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> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| { | ||
| "name": "gmp", | ||
| "version-string": "6.2.1-2", | ||
| "description": "The GNU Multiple Precision Arithmetic Library", | ||
| "homepage": "https://gmplib.org", | ||
| "supports": "windows & !(arm | arm64)", | ||
|
Contributor
There was a problem hiding this comment. This precise line removed GMP tests from CI for many configs without further notice @Neumann-A #15957 .
Member
There was a problem hiding this comment. Yeah I must have missed this on review and shouldn't have merged that. Oops!
Contributor
There was a problem hiding this comment. It happens, don't worry :)
Contributor
Author
There was a problem hiding this comment. This is my fault, sorry for my mistakes! I will submit a PR to fix it. |
||
| "dependencies": [ | ||
| { | ||
| "name": "vs-yasm", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note to other reviewers: this -2 is in the upstream versioning scheme and is unrelated to our port-version conventions.