From 279113900209ba624c71020fde22ea9ac089e04e Mon Sep 17 00:00:00 2001 From: cp Date: Mon, 12 Apr 2021 19:52:25 +0200 Subject: [PATCH] Fix boost dependency url. Original host's lifetime has ended, see here: https://github.com/boostorg/boost/issues/502 This is PR #6349, amended by @lukasmatena who added the changes for platforms other than Windows. --- deps/deps-linux.cmake | 4 ++-- deps/deps-macos.cmake | 4 ++-- deps/deps-mingw.cmake | 5 +++-- deps/deps-windows.cmake | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake index 35522504c..c81d6785d 100644 --- a/deps/deps-linux.cmake +++ b/deps/deps-linux.cmake @@ -13,7 +13,7 @@ include("deps-unix-common.cmake") ExternalProject_Add(dep_boost EXCLUDE_FROM_ALL 1 - URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz" + URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz" URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a BUILD_IN_SOURCE 1 CONFIGURE_COMMAND ./bootstrap.sh @@ -100,5 +100,5 @@ ExternalProject_Add(dep_libcurl BUILD_COMMAND make "-j${NPROC}" INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" ) - add_dependencies(dep_openvdb dep_boost) + diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake index 53ba008c3..de77dafa8 100644 --- a/deps/deps-macos.cmake +++ b/deps/deps-macos.cmake @@ -18,7 +18,7 @@ include("deps-unix-common.cmake") ExternalProject_Add(dep_boost EXCLUDE_FROM_ALL 1 - URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz" + URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz" URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a BUILD_IN_SOURCE 1 CONFIGURE_COMMAND ./bootstrap.sh @@ -87,5 +87,5 @@ ExternalProject_Add(dep_libcurl BUILD_COMMAND make "-j${NPROC}" INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" ) +add_dependencies(dep_openvdb dep_boost) -add_dependencies(dep_openvdb dep_boost) \ No newline at end of file diff --git a/deps/deps-mingw.cmake b/deps/deps-mingw.cmake index c97346bb0..cae7fc371 100644 --- a/deps/deps-mingw.cmake +++ b/deps/deps-mingw.cmake @@ -9,7 +9,7 @@ include("deps-unix-common.cmake") ExternalProject_Add(dep_boost EXCLUDE_FROM_ALL 1 - URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz" + URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz" URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a BUILD_IN_SOURCE 1 CONFIGURE_COMMAND bootstrap.bat @@ -58,4 +58,5 @@ ExternalProject_Add(dep_libcurl -DCURL_DISABLE_GOPHER=ON -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local ${DEP_CMAKE_OPTS} -) \ No newline at end of file +) + diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index c0d80bb29..fc9f55f5f 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -55,7 +55,7 @@ endmacro() ExternalProject_Add(dep_boost EXCLUDE_FROM_ALL 1 - URL "https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz" + URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz" URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a BUILD_IN_SOURCE 1 CONFIGURE_COMMAND bootstrap.bat @@ -295,4 +295,5 @@ if (${DEP_DEBUG}) COMMAND msbuild /m /P:Configuration=Debug INSTALL.vcxproj WORKING_DIRECTORY "${BINARY_DIR}" ) -endif () \ No newline at end of file +endif () +