You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ab...@apache.org on 2020/12/07 14:44:10 UTC
[nifi-minifi-cpp] branch main updated: MINIFICPP-1420 - Add
alternate mirrors for libsodium
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 08272db MINIFICPP-1420 - Add alternate mirrors for libsodium
08272db is described below
commit 08272dba59047b2bf9a0402633fdc24689ffe13b
Author: Adam Hunyadi <hu...@gmail.com>
AuthorDate: Mon Dec 7 12:44:06 2020 +0100
MINIFICPP-1420 - Add alternate mirrors for libsodium
Signed-off-by: Arpad Boda <ab...@apache.org>
This closes #951
---
cmake/BundledLibSodium.cmake | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake
index 6e3b7e4..3a3daf4 100644
--- a/cmake/BundledLibSodium.cmake
+++ b/cmake/BundledLibSodium.cmake
@@ -40,13 +40,15 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
endif()
# Build project
- set(LIBSODIUM_URL https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz)
+ set(LIBSODIUM_OFFICIAL_MIRROR_URL https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz)
+ set(LIBSODIUM_GITHUB_MIRROR_URL https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz)
+ set(LIBSODIUM_GENTOO_MIRROR_URL https://gentoo.osuosl.org/distfiles/libsodium-1.0.18.tar.gz)
set(LIBSODIUM_URL_HASH "SHA256=6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1")
if (WIN32)
ExternalProject_Add(
libsodium-external
- URL ${LIBSODIUM_URL}
+ URL "${LIBSODIUM_OFFICIAL_MIRROR_URL} ${LIBSODIUM_GITHUB_MIRROR_URL} ${LIBSODIUM_GENTOO_MIRROR_URL}"
URL_HASH ${LIBSODIUM_URL_HASH}
SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"
LIST_SEPARATOR % # This is needed for passing semicolon-separated lists
@@ -60,7 +62,7 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
ExternalProject_Add(
libsodium-external
- URL ${LIBSODIUM_URL}
+ URL "${LIBSODIUM_OFFICIAL_MIRROR_URL} ${LIBSODIUM_GITHUB_MIRROR_URL} ${LIBSODIUM_GENTOO_MIRROR_URL}"
URL_HASH ${LIBSODIUM_URL_HASH}
BUILD_IN_SOURCE true
SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"