You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2020/04/15 00:56:16 UTC
[arrow] branch master updated: ARROW-8458: [C++] Prefer the
original mirrors for the bundled thirdparty dependencies
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 5673c43 ARROW-8458: [C++] Prefer the original mirrors for the bundled thirdparty dependencies
5673c43 is described below
commit 5673c43a20db86c89c80cc7f29c21ab3009019b5
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Wed Apr 15 02:55:57 2020 +0200
ARROW-8458: [C++] Prefer the original mirrors for the bundled thirdparty dependencies
Also need to run the crossbow packaging tasks.
The recommended apache endpoint is documented [here](https://infra.apache.org/release-download-pages.html#closer).
Closes #6937 from kszucs/3rdparty_urls
Authored-by: Krisztián Szűcs <sz...@gmail.com>
Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
ci/scripts/util_download_apache.sh | 2 +-
cpp/cmake_modules/ThirdpartyToolchain.cmake | 66 +++++++++++++++++------------
2 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/ci/scripts/util_download_apache.sh b/ci/scripts/util_download_apache.sh
index 6889396..5d37f9c 100755
--- a/ci/scripts/util_download_apache.sh
+++ b/ci/scripts/util_download_apache.sh
@@ -25,7 +25,7 @@ tarball_path=$1
target_dir=$2
APACHE_MIRRORS=(
- "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename="
+ "http://www.apache.org/dyn/closer.cgi?action=download&filename="
"https://downloads.apache.org"
"https://apache.claz.org"
"https://apache.cs.utah.edu"
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 9d63e32..bfc2af9 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -251,8 +251,8 @@ if(DEFINED ENV{ARROW_AWSSDK_URL})
else()
set_urls(
AWSSDK_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/aws-sdk-cpp-${ARROW_AWSSDK_BUILD_VERSION}.tar.gz"
"https://github.com/aws/aws-sdk-cpp/archive/${ARROW_AWSSDK_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/aws-sdk-cpp-${ARROW_AWSSDK_BUILD_VERSION}.tar.gz"
"https://dl.bintray.com/ursalabs/arrow-awssdk/aws-sdk-cpp-${ARROW_AWSSDK_BUILD_VERSION}.tar.gz/aws-sdk-cpp-${ARROW_AWSSDK_BUILD_VERSION}.tar.gz"
)
endif()
@@ -267,13 +267,12 @@ else()
# These are trimmed boost bundles we maintain.
# See cpp/build_support/trim-boost.sh
"https://dl.bintray.com/ursalabs/arrow-boost/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
+ "https://dl.bintray.com/boostorg/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
+ "https://github.com/boostorg/boost/archive/boost-${ARROW_BOOST_BUILD_VERSION}.tar.gz"
# FIXME(ARROW-6407) automate uploading this archive to ensure it reflects
# our currently used packages and doesn't fall out of sync with
# ${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}
"https://github.com/ursa-labs/thirdparty/releases/download/latest/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
- # Fallback: full boost bundles.
- "https://github.com/boostorg/boost/archive/boost-${ARROW_BOOST_BUILD_VERSION}.tar.gz"
- "https://dl.bintray.com/boostorg/release/${ARROW_BOOST_BUILD_VERSION}/source/boost_${ARROW_BOOST_BUILD_VERSION_UNDERSCORES}.tar.gz"
)
endif()
@@ -282,8 +281,9 @@ if(DEFINED ENV{ARROW_BROTLI_URL})
else()
set_urls(
BROTLI_SOURCE_URL
+ "https://github.com/google/brotli/archive/${ARROW_BROTLI_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/brotli-${ARROW_BROTLI_BUILD_VERSION}.tar.gz"
- "https://github.com/google/brotli/archive/${ARROW_BROTLI_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_CARES_URL})
@@ -291,8 +291,9 @@ if(DEFINED ENV{ARROW_CARES_URL})
else()
set_urls(
CARES_SOURCE_URL
+ "https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/cares-${ARROW_CARES_BUILD_VERSION}.tar.gz"
- "https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_GBENCHMARK_URL})
@@ -300,8 +301,8 @@ if(DEFINED ENV{ARROW_GBENCHMARK_URL})
else()
set_urls(
GBENCHMARK_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/gbenchmark-${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz"
"https://github.com/google/benchmark/archive/${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/gbenchmark-${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz"
)
endif()
@@ -310,8 +311,9 @@ if(DEFINED ENV{ARROW_GFLAGS_URL})
else()
set_urls(
GFLAGS_SOURCE_URL
+ "https://github.com/gflags/gflags/archive/${ARROW_GFLAGS_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/gflags-${ARROW_GFLAGS_BUILD_VERSION}.tar.gz"
- "https://github.com/gflags/gflags/archive/${ARROW_GFLAGS_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_GLOG_URL})
@@ -319,8 +321,9 @@ if(DEFINED ENV{ARROW_GLOG_URL})
else()
set_urls(
GLOG_SOURCE_URL
+ "https://github.com/google/glog/archive/${ARROW_GLOG_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/glog-${ARROW_GLOG_BUILD_VERSION}.tar.gz"
- "https://github.com/google/glog/archive/${ARROW_GLOG_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_GRPC_URL})
@@ -328,8 +331,9 @@ if(DEFINED ENV{ARROW_GRPC_URL})
else()
set_urls(
GRPC_SOURCE_URL
+ "https://github.com/grpc/grpc/archive/${ARROW_GRPC_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/grpc-${ARROW_GRPC_BUILD_VERSION}.tar.gz"
- "https://github.com/grpc/grpc/archive/${ARROW_GRPC_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_GTEST_URL})
@@ -337,10 +341,10 @@ if(DEFINED ENV{ARROW_GTEST_URL})
else()
set_urls(
GTEST_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
"https://github.com/google/googletest/archive/release-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
- "https://dl.bintray.com/ursalabs/arrow-gtest/gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
"https://chromium.googlesource.com/external/github.com/google/googletest/+archive/release-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
+ "https://dl.bintray.com/ursalabs/arrow-gtest/gtest-${ARROW_GTEST_BUILD_VERSION}.tar.gz"
)
endif()
@@ -349,8 +353,8 @@ if(DEFINED ENV{ARROW_JEMALLOC_URL})
else()
set_urls(
JEMALLOC_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/jemalloc-${ARROW_JEMALLOC_BUILD_VERSION}.tar.bz2"
"https://github.com/jemalloc/jemalloc/releases/download/${ARROW_JEMALLOC_BUILD_VERSION}/jemalloc-${ARROW_JEMALLOC_BUILD_VERSION}.tar.bz2"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/jemalloc-${ARROW_JEMALLOC_BUILD_VERSION}.tar.bz2"
)
endif()
@@ -359,8 +363,8 @@ if(DEFINED ENV{ARROW_MIMALLOC_URL})
else()
set_urls(
MIMALLOC_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/mimalloc-${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz"
"https://github.com/microsoft/mimalloc/archive/${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/mimalloc-${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz"
)
endif()
@@ -368,9 +372,9 @@ if(DEFINED ENV{ARROW_LZ4_URL})
set(LZ4_SOURCE_URL "$ENV{ARROW_LZ4_URL}")
else()
set_urls(
- LZ4_SOURCE_URL
+ LZ4_SOURCE_URL "https://github.com/lz4/lz4/archive/${ARROW_LZ4_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/lz4-${ARROW_LZ4_BUILD_VERSION}.tar.gz"
- "https://github.com/lz4/lz4/archive/${ARROW_LZ4_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_ORC_URL})
@@ -378,8 +382,9 @@ if(DEFINED ENV{ARROW_ORC_URL})
else()
set_urls(
ORC_SOURCE_URL
+ "https://github.com/apache/orc/archive/rel/release-${ARROW_ORC_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/orc-${ARROW_ORC_BUILD_VERSION}.tar.gz"
- "https://github.com/apache/orc/archive/rel/release-${ARROW_ORC_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_PROTOBUF_URL})
@@ -390,8 +395,8 @@ else()
# strip the leading `v`
set_urls(
PROTOBUF_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/protobuf-${ARROW_PROTOBUF_BUILD_VERSION}.tar.gz"
"https://github.com/protocolbuffers/protobuf/releases/download/${ARROW_PROTOBUF_BUILD_VERSION}/protobuf-all-${ARROW_PROTOBUF_STRIPPED_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/protobuf-${ARROW_PROTOBUF_BUILD_VERSION}.tar.gz"
)
endif()
@@ -400,8 +405,9 @@ if(DEFINED ENV{ARROW_RE2_URL})
else()
set_urls(
RE2_SOURCE_URL
+ "https://github.com/google/re2/archive/${ARROW_RE2_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/re2-${ARROW_RE2_BUILD_VERSION}.tar.gz"
- "https://github.com/google/re2/archive/${ARROW_RE2_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_RAPIDJSON_URL})
@@ -409,8 +415,8 @@ if(DEFINED ENV{ARROW_RAPIDJSON_URL})
else()
set_urls(
RAPIDJSON_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/rapidjson-${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz"
"https://github.com/miloyip/rapidjson/archive/${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/rapidjson-${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz"
)
endif()
@@ -419,8 +425,9 @@ if(DEFINED ENV{ARROW_SNAPPY_URL})
else()
set_urls(
SNAPPY_SOURCE_URL
+ "https://github.com/google/snappy/archive/${ARROW_SNAPPY_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/snappy-${ARROW_SNAPPY_BUILD_VERSION}.tar.gz"
- "https://github.com/google/snappy/archive/${ARROW_SNAPPY_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_THRIFT_URL})
@@ -428,10 +435,9 @@ if(DEFINED ENV{ARROW_THRIFT_URL})
else()
set_urls(
THRIFT_SOURCE_URL
- "https://github.com/ursa-labs/thirdparty/releases/download/latest/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
- "https://github.com/apache/thrift/archive/v${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
- "https://dl.bintray.com/ursalabs/arrow-thrift/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
+ "http://www.apache.org/dyn/closer.cgi?action=download&filename=/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
"https://downloads.apache.org/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
+ "https://github.com/apache/thrift/archive/v${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
"https://apache.claz.org/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
"https://apache.cs.utah.edu/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
"https://apache.mirrors.lucidnetworks.net/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
@@ -443,6 +449,8 @@ else()
"https://mirrors.ocf.berkeley.edu/apache/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
"https://mirrors.sonic.net/apache/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
"https://us.mirrors.quenda.co/apache/thrift/${ARROW_THRIFT_BUILD_VERSION}/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
+ "https://github.com/ursa-labs/thirdparty/releases/download/latest/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
+ "https://dl.bintray.com/ursalabs/arrow-thrift/thrift-${ARROW_THRIFT_BUILD_VERSION}.tar.gz"
)
endif()
@@ -450,9 +458,9 @@ if(DEFINED ENV{ARROW_ZLIB_URL})
set(ZLIB_SOURCE_URL "$ENV{ARROW_ZLIB_URL}")
else()
set_urls(
- ZLIB_SOURCE_URL
+ ZLIB_SOURCE_URL "https://zlib.net/fossils/zlib-${ARROW_ZLIB_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/zlib-${ARROW_ZLIB_BUILD_VERSION}.tar.gz"
- "https://zlib.net/fossils/zlib-${ARROW_ZLIB_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{ARROW_ZSTD_URL})
@@ -460,8 +468,9 @@ if(DEFINED ENV{ARROW_ZSTD_URL})
else()
set_urls(
ZSTD_SOURCE_URL
+ "https://github.com/facebook/zstd/archive/${ARROW_ZSTD_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/zstd-${ARROW_ZSTD_BUILD_VERSION}.tar.gz"
- "https://github.com/facebook/zstd/archive/${ARROW_ZSTD_BUILD_VERSION}.tar.gz")
+ )
endif()
if(DEFINED ENV{BZIP2_SOURCE_URL})
@@ -469,8 +478,9 @@ if(DEFINED ENV{BZIP2_SOURCE_URL})
else()
set_urls(
BZIP2_SOURCE_URL
+ "https://sourceware.org/pub/bzip2/bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz"
"https://github.com/ursa-labs/thirdparty/releases/download/latest/bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz"
- "https://sourceware.org/pub/bzip2/bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz")
+ )
endif()
# ----------------------------------------------------------------------