diff options
| author | Lucius Q. User <31438459+Lucius-Q-User@users.noreply.github.com> | 2021-06-11 19:24:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 09:24:56 -0700 |
| commit | 14ac375e5ee426e5152f75fa43749ba177350186 (patch) | |
| tree | d539a721f261d9ce342b6fd11c11adaa0791f4f8 | |
| parent | 4d6d09bbcfbb2ab5623c3525dc04a812c40a7d8d (diff) | |
| download | vcpkg-14ac375e5ee426e5152f75fa43749ba177350186.tar.gz vcpkg-14ac375e5ee426e5152f75fa43749ba177350186.zip | |
[openssl] Fix build on ARM64 macos (#18310)
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 8 | ||||
| -rw-r--r-- | scripts/vcpkgTools.xml | 24 |
2 files changed, 16 insertions, 16 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 3ef867ecc..327bc5fa5 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -215,19 +215,19 @@ function(vcpkg_find_acquire_program VAR) set(HASH f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) elseif(VAR MATCHES "NINJA") set(PROGNAME ninja) - set(NINJA_VERSION 1.10.1) + set(NINJA_VERSION 1.10.2) set(_vfa_SUPPORTED ON) if(CMAKE_HOST_WIN32) set(ARCHIVE "ninja-win-${NINJA_VERSION}.zip") set(SUBDIR "${NINJA_VERSION}-windows") set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-win.zip") - set(HASH 0120054f0fea6eea4035866201f69fba1c039f681f680cfcbbefcaee97419815d092a6e2f3823ea6c3928ad296395f36029e337127ee977270000b35df5f9c40) + set(HASH 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(ARCHIVE "ninja-mac-${NINJA_VERSION}.zip") set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-mac.zip") set(SUBDIR "${NINJA_VERSION}-osx") set(PATHS "${DOWNLOADS}/tools/ninja-${NINJA_VERSION}-osx") - set(HASH 99f5ccca2461a4d340f4528a8eef6d81180757da78313f1f9412ed13a7bbaf6df537a342536fd053db00524bcb734d205af5f6fde419a1eb2e6f77ee8b7860fe) + set(HASH bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") set(_vfa_SUPPORTED OFF) @@ -236,7 +236,7 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip") set(SUBDIR "${NINJA_VERSION}-linux") set(PATHS "${DOWNLOADS}/tools/ninja-${NINJA_VERSION}-linux") - set(HASH 9820c76fde6fac398743766e7ea0fe8a7d6e4191a77512a2d2f51c2ddcc947fcd91ac08522742281a285418c114e760b0158a968305f8dc854bb9693883b7f1e) + set(HASH 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) endif() set(VERSION_CMD --version) elseif(VAR MATCHES "NUGET") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 43982e0ec..746ae92f9 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -127,25 +127,25 @@ <archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName> </tool> <tool name="ninja" os="windows"> - <version>1.10.1</version> + <version>1.10.2</version> <exeRelativePath>ninja.exe</exeRelativePath> - <url>https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-win.zip</url> - <sha512>0120054f0fea6eea4035866201f69fba1c039f681f680cfcbbefcaee97419815d092a6e2f3823ea6c3928ad296395f36029e337127ee977270000b35df5f9c40</sha512> - <archiveName>ninja-win-1.10.1.zip</archiveName> + <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip</url> + <sha512>6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3</sha512> + <archiveName>ninja-win-1.10.2.zip</archiveName> </tool> <tool name="ninja" os="linux"> - <version>1.10.1</version> + <version>1.10.2</version> <exeRelativePath>ninja</exeRelativePath> - <url>https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-linux.zip</url> - <sha512>9820c76fde6fac398743766e7ea0fe8a7d6e4191a77512a2d2f51c2ddcc947fcd91ac08522742281a285418c114e760b0158a968305f8dc854bb9693883b7f1e</sha512> - <archiveName>ninja-linux-1.10.1.zip</archiveName> + <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip</url> + <sha512>93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3</sha512> + <archiveName>ninja-linux-1.10.2.zip</archiveName> </tool> <tool name="ninja" os="osx"> - <version>1.10.1</version> + <version>1.10.2</version> <exeRelativePath>ninja</exeRelativePath> - <url>https://github.com/ninja-build/ninja/releases/download/v1.10.1/ninja-mac.zip</url> - <sha512>99f5ccca2461a4d340f4528a8eef6d81180757da78313f1f9412ed13a7bbaf6df537a342536fd053db00524bcb734d205af5f6fde419a1eb2e6f77ee8b7860fe</sha512> - <archiveName>ninja-mac-1.10.1.zip</archiveName> + <url>https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip</url> + <sha512>bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b</sha512> + <archiveName>ninja-mac-1.10.2.zip</archiveName> </tool> <tool name="ninja" os="freebsd"> <version>1.8.2</version> |