Skip to content

Commit

Permalink
[vcpkg_from_git] Use tar.gz because .zip has different hash in differ…
Browse files Browse the repository at this point in the history
…ent timezones
  • Loading branch information
alexkaratarakis committed Nov 9, 2018
1 parent accde13 commit f7f06c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ports/fdlibm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL https://android.googlesource.com/platform/external/fdlibm
REF 59f7335e4dd8275a7dc2f8aeb4fd00758fde37ac
SHA512 08c16ff7cc6f24d962090bf5ab192d3c8ab33d9f60390ca510898c918cefa1b19572ad6bbf49c327bb09d8a9ab52d8341ec14c44abe169d2d319523567f1300f
SHA512 bc788c840a57716f996513980d31b203bd86ce9af1ac3656a187266bfdc2fbb22a9ddf88f79ffc91dd75f3f1f1e4fd3449a42b566ffe5e49e9384efd91a68613
)

file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
Expand Down
5 changes: 3 additions & 2 deletions scripts/cmake/vcpkg_from_git.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ function(vcpkg_from_git)
message(FATAL_ERROR "vcpkg_from_git requires a SHA512 argument. If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.")
endif()

# using .tar.gz instead of .zip because the hash of the latter is affected by timezone.
string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}")
set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.zip")
set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.zip")
set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.tar.gz")
set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.tar.gz")
set(TEMP_SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SANITIZED_REF}")

function(test_hash FILE_PATH FILE_KIND CUSTOM_ERROR_ADVICE)
Expand Down

0 comments on commit f7f06c5

Please sign in to comment.