diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
| commit | 1908903508bf057ad05d8a344e5bc55477944cb6 (patch) | |
| tree | 2a23595f1e7d8cc9a6358bfd44a00eb7368d8a1b /ports/mpir | |
| parent | b0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e (diff) | |
| parent | 8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff) | |
| download | vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.tar.gz vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802
Diffstat (limited to 'ports/mpir')
| -rw-r--r-- | ports/mpir/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mpir/enable-runtimelibrary-toggle.patch | 3 | ||||
| -rw-r--r-- | ports/mpir/portfile.cmake | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL index 7a8dd7985..5a944e6bd 100644 --- a/ports/mpir/CONTROL +++ b/ports/mpir/CONTROL @@ -1,3 +1,3 @@ Source: mpir -Version: 3.0.0-5 +Version: 3.0.0-7 Description: Multiple Precision Integers and Rationals. diff --git a/ports/mpir/enable-runtimelibrary-toggle.patch b/ports/mpir/enable-runtimelibrary-toggle.patch index d0260e869..391d4e103 100644 --- a/ports/mpir/enable-runtimelibrary-toggle.patch +++ b/ports/mpir/enable-runtimelibrary-toggle.patch @@ -2,12 +2,13 @@ diff --git a/build.vc/mpir_debug_lib.props b/build.vc/mpir_debug_lib.props index b2fd57b..3937570 100644 --- a/build.vc/mpir_debug_lib.props +++ b/build.vc/mpir_debug_lib.props -@@ -9,7 +9,7 @@ +@@ -9,7 +9,8 @@ <ItemDefinitionGroup> <ClCompile> <ObjectFileName>$(IntDir)dum\my\%(RelativeDir)</ObjectFileName> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary>$(RuntimeLibrary)</RuntimeLibrary> ++ <DebugInformationFormat>OldStyle</DebugInformationFormat> <ProgramDataBaseFileName>$(TargetDir)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> <Link> diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake index 5f54fa08f..42dd34c94 100644 --- a/ports/mpir/portfile.cmake +++ b/ports/mpir/portfile.cmake @@ -71,7 +71,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME) ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/info) - configure_file(${SOURCE_PATH}/COPYING.lib ${CURRENT_PACKAGES_DIR}/share/mpir/copyright COPYONLY) + configure_file(${SOURCE_PATH}/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/mpir/copyright COPYONLY) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH |