You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2021/03/26 00:01:48 UTC
[arrow] branch master updated: ARROW-12086: [C++] Fix environment
variables for bzip2, utf8proc URLs
This is an automated email from the ASF dual-hosted git repository.
kou 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 b619cae ARROW-12086: [C++] Fix environment variables for bzip2, utf8proc URLs
b619cae is described below
commit b619caebf4476283accf33ee449b8ab32e2067fc
Author: Antoine Pitrou <an...@python.org>
AuthorDate: Fri Mar 26 08:59:54 2021 +0900
ARROW-12086: [C++] Fix environment variables for bzip2, utf8proc URLs
This should fix offline builds after having run `./thirdparty/download_dependencies.sh`.
Closes #9803 from pitrou/ARROW-12086-offline-builds
Authored-by: Antoine Pitrou <an...@python.org>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 38 ++++++++++++++---------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index bfa3ee1..053defb 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -405,6 +405,16 @@ else()
)
endif()
+if(DEFINED ENV{ARROW_BZIP2_URL})
+ set(ARROW_BZIP2_SOURCE_URL "$ENV{ARROW_BZIP2_URL}")
+else()
+ set_urls(
+ ARROW_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"
+ )
+endif()
+
if(DEFINED ENV{ARROW_CARES_URL})
set(CARES_SOURCE_URL "$ENV{ARROW_CARES_URL}")
else()
@@ -571,6 +581,15 @@ else()
)
endif()
+if(DEFINED ENV{ARROW_UTF8PROC_URL})
+ set(ARROW_UTF8PROC_SOURCE_URL "$ENV{ARROW_UTF8PROC_URL}")
+else()
+ set_urls(
+ ARROW_UTF8PROC_SOURCE_URL
+ "https://github.com/JuliaStrings/utf8proc/archive/${ARROW_UTF8PROC_BUILD_VERSION}.tar.gz"
+ )
+endif()
+
if(DEFINED ENV{ARROW_XSIMD_URL})
set(XSIMD_SOURCE_URL "$ENV{ARROW_XSIMD_URL}")
else()
@@ -598,25 +617,6 @@ else()
)
endif()
-if(DEFINED ENV{ARROW_BZIP2_SOURCE_URL})
- set(ARROW_BZIP2_SOURCE_URL "$ENV{ARROW_BZIP2_SOURCE_URL}")
-else()
- set_urls(
- ARROW_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"
- )
-endif()
-
-if(DEFINED ENV{ARROW_UTF8PROC_SOURCE_URL})
- set(ARROW_UTF8PROC_SOURCE_URL "$ENV{ARROW_UTF8PROC_SOURCE_URL}")
-else()
- set_urls(
- ARROW_UTF8PROC_SOURCE_URL
- "https://github.com/JuliaStrings/utf8proc/archive/${ARROW_UTF8PROC_BUILD_VERSION}.tar.gz"
- )
-endif()
-
# ----------------------------------------------------------------------
# ExternalProject options