upgrade to windows MinGit 2.21.0 (#6041)

* [fdlibm] update hash
This commit is contained in:
Phil Christensen 2019-04-15 22:28:45 -07:00 committed by GitHub
parent bd51bdd039
commit 56bc2f9160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 29 deletions

View File

@ -1,3 +1,3 @@
Source: fdlibm Source: fdlibm
Version: 5.3-2 Version: 5.3-3
Description: FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic Description: FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic

View File

@ -1,24 +1,37 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
vcpkg_from_git( # vcpkg_from_git uses git archive to generate the hash,
OUT_SOURCE_PATH SOURCE_PATH # depending on what system or git settings this runs with it will result in a different hash
URL https://android.googlesource.com/platform/external/fdlibm if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac set(FDLIBM_HASH 825dcbbb88e3ebda6d928e1794da58d5135d37e36551c12de7eeab58a67adc4f5629c65d6afde567daeb489c287302116b2a5bbdb16693a3b068bbe16b250cf7)
SHA512 bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
) set(FDLIBM_HASH 954c75f9f7540f4efb21b1f8de296149c648c0ba10d5e9cc99a247164b9e99b6dc37349a9ddaa04ba93dc035562457665aacf7146926d716cd406b63b97c5d44)
else()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) # depending on how git is configured the hash could be
file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH}) # bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613
set(FDLIBM_HASH 75c49ba2875b73e0bfe3a4595be1478ce6041236653b803b02ba00997652c969c351c9647923692af0799149da86c737467ab2954bd8845a2f75b14fde71ac29)
vcpkg_configure_cmake( endif()
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA vcpkg_from_git(
OPTIONS_DEBUG OUT_SOURCE_PATH SOURCE_PATH
-DDISABLE_INSTALL_HEADERS=ON URL https://android.googlesource.com/platform/external/fdlibm
) REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
SHA512 ${FDLIBM_HASH}
vcpkg_install_cmake() )
vcpkg_copy_pdbs()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
# Handle copyright file(COPY ${CMAKE_CURRENT_LIST_DIR}/libm5.def DESTINATION ${SOURCE_PATH})
configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
# Handle copyright
configure_file(${SOURCE_PATH}/NOTICE ${CURRENT_PACKAGES_DIR}/share/fdlibm/copyright COPYONLY)

View File

@ -29,11 +29,11 @@
<archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName> <archiveName>cmake-3.12.4-FreeBSD-x86_64.tar.gz</archiveName>
</tool> </tool>
<tool name="git" os="windows"> <tool name="git" os="windows">
<version>2.20.0</version> <version>2.21.0-1</version>
<exeRelativePath>mingw32\bin\git.exe</exeRelativePath> <exeRelativePath>mingw32\bin\git.exe</exeRelativePath>
<url>https://github.com/git-for-windows/git/releases/download/v2.20.0.windows.1/PortableGit-2.20.0-32-bit.7z.exe</url> <url>https://github.com/git-for-windows/git/releases/download/v2.21.0.windows.1/PortableGit-2.21.0-32-bit.7z.exe</url>
<sha512>81647a87df9fde0945ef597cb1cafd8f5f42859da89e9b1db55222a261407bc16bdcc0cf1e86e315697f0981832fe10fc02845cad4b4c82ea64bbd218aec6a49</sha512> <sha512>d5600fc35e91cfa84e3547e38a9da9798cf0a53810cc35ac9a0dee671c4ef0e9fbcbe3eda9c790f8db4eafce7ce58d7a168d28938a66cdcca000bf5a7f5267c1</sha512>
<archiveName>PortableGit-2.20.0-32-bit.7z.exe</archiveName> <archiveName>PortableGit-2.21.0-32-bit.7z.exe</archiveName>
</tool> </tool>
<tool name="git" os="linux"> <tool name="git" os="linux">
<version>2.7.4</version> <version>2.7.4</version>