From 8f7e8c55700adb7331348d78425348dfa9f28d78 Mon Sep 17 00:00:00 2001 From: zhiru Date: Sun, 2 Jun 2019 11:46:31 +0800 Subject: [PATCH] MS-54 - cmake: Change Thirft thrid party URL to github.com Former-commit-id: 7ce6dad58035d01db9f7060be2b1142014434383 --- cpp/CHANGELOG.md | 1 + cpp/cmake/ThirdPartyPackages.cmake | 2 +- cpp/thirdparty/versions.txt | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 80d1a70c..13fcc76e 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -17,6 +17,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-26 - cmake. Add thirdparty packages - MS-31 - cmake: add prometheus - MS-33 - cmake: add -j4 to make third party packages build faster +- MS-54 - cmake: Change Thirft thrid party URL to github.com ### Task diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake index 81678793..0a83d114 100644 --- a/cpp/cmake/ThirdPartyPackages.cmake +++ b/cpp/cmake/ThirdPartyPackages.cmake @@ -288,7 +288,7 @@ if(DEFINED ENV{MEGASEARCH_THRIFT_URL}) set(THRIFT_SOURCE_URL "$ENV{MEGASEARCH_THRIFT_URL}") else() set(THRIFT_SOURCE_URL - "http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz") + "https://github.com/apache/thrift/archive/${THRIFT_VERSION}.tar.gz") endif() if(DEFINED ENV{MEGASEARCH_YAMLCPP_URL}) diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt index 6357f5df..168b45e7 100644 --- a/cpp/thirdparty/versions.txt +++ b/cpp/thirdparty/versions.txt @@ -36,7 +36,7 @@ ROCKSDB_VERSION=v6.0.2 SNAPPY_VERSION=1.1.7 SQLITE_VERSION=3280000 SQLITE_ORM_VERSION=master -THRIFT_VERSION=0.12.0 +THRIFT_VERSION=v0.12.0 YAMLCPP_VERSION=0.6.2 ZLIB_VERSION=v1.2.11 ZSTD_VERSION=v1.4.0 @@ -59,7 +59,7 @@ DEPENDENCIES=( "MEGASEARCH_SNAPPY_URL snappy-${SNAPPY_VERSION}.tar.gz https://github.com/google/snappy/archive/${SNAPPY_VERSION}.tar.gz" "MEGASEARCH_SQLITE_URL sqlite-autoconf-${SQLITE_VERSION}.tar.gz https://www.sqlite.org/2019/sqlite-autoconf-${SQLITE_VERSION}.tar.gz" "MEGASEARCH_SQLITE_ORM_URL sqlite_orm-${SQLITE_ORM_VERSION}.tar.gz https://github.com/fnc12/sqlite_orm/archive/${SQLITE_ORM_VERSION}.tar.gz" - "MEGASEARCH_THRIFT_URL thrift-${THRIFT_VERSION}.tar.gz http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz" + "MEGASEARCH_THRIFT_URL thrift-${THRIFT_VERSION}.tar.gz https://github.com/apache/thrift/archive/${THRIFT_VERSION}.tar.gz" "MEGASEARCH_YAMLCPP_URL yaml-cpp-${YAMLCPP_VERSION}.tar.gz https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${YAMLCPP_VERSION}.tar.gz" "MEGASEARCH_ZLIB_URL zlib-${ZLIB_VERSION}.tar.gz https://github.com/madler/zlib/archive/${ZLIB_VERSION}.tar.gz" "MEGASEARCH_ZSTD_URL zstd-${ZSTD_VERSION}.tar.gz https://github.com/facebook/zstd/archive/${ZSTD_VERSION}.tar.gz" -- GitLab