You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2018/12/17 21:11:32 UTC

[arrow] branch master updated: ARROW-4033: [C++] Use readlink -f instead of realpath in dependency download script

This is an automated email from the ASF dual-hosted git repository.

wesm 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 0b78f4b  ARROW-4033: [C++] Use readlink -f instead of realpath in dependency download script
0b78f4b is described below

commit 0b78f4bdf70617279bbd3997ed79a7194cf66438
Author: Wes McKinney <we...@apache.org>
AuthorDate: Mon Dec 17 15:11:25 2018 -0600

    ARROW-4033: [C++] Use readlink -f instead of realpath in dependency download script
    
    This documentation might be better moved to the Sphinx docs.
    
    Author: Wes McKinney <we...@apache.org>
    
    Closes #3205 from wesm/ARROW-4033 and squashes the following commits:
    
    21349f02f <Wes McKinney> Use readlink -f instead of realpath
---
 cpp/thirdparty/README.md                | 45 ++++++++++++++++++++-------------
 cpp/thirdparty/download_dependencies.sh |  2 +-
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/cpp/thirdparty/README.md b/cpp/thirdparty/README.md
index bd1cb28..0353395 100644
--- a/cpp/thirdparty/README.md
+++ b/cpp/thirdparty/README.md
@@ -29,17 +29,24 @@ offline builds.
 To set up your own specific build toolchain, here are the relevant environment
 variables
 
+* brotli: `BROTLI_HOME`, can be disabled with `-DARROW_WITH_BROTLI=off`
 * Boost: `BOOST_ROOT`
+* double-conversion: `DOUBLE_CONVERSION_HOME`
 * Googletest: `GTEST_HOME` (only required to build the unit tests)
 * gflags: `GFLAGS_HOME` (only required to build the unit tests)
+* glog: `GLOG_HOME` (only required if `ARROW_USE_GLOG=ON`)
 * Google Benchmark: `GBENCHMARK_HOME` (only required if building benchmarks)
 * Flatbuffers: `FLATBUFFERS_HOME` (only required for -DARROW_IPC=on, which is
   the default)
 * Hadoop: `HADOOP_HOME` (only required for the HDFS I/O extensions)
 * jemalloc: `JEMALLOC_HOME`
-* brotli: `BROTLI_HOME`, can be disabled with `-DARROW_WITH_BROTLI=off`
 * lz4: `LZ4_HOME`, can be disabled with `-DARROW_WITH_LZ4=off`
+* Apache ORC: `ORC_HOME`
+* protobuf: `PROTOBUF_HOME`
+* rapidjson: `RAPIDJSON_HOME`
+* re2: `RE2_HOME` (only required to build Gandiva currently)
 * snappy: `SNAPPY_HOME`, can be disabled with `-DARROW_WITH_SNAPPY=off`
+* thrift: `THRIFT_HOME`
 * zlib: `ZLIB_HOME`, can be disabled with `-DARROW_WITH_ZLIB=off`
 * zstd: `ZSTD_HOME`, can be disabled with `-DARROW_WITH_ZSTD=off`
 
@@ -69,24 +76,26 @@ script:
 
 ```shell
 # Download tarballs into `$HOME/arrow-thirdparty-deps`
-$ ./thirdparty/download_dependencies $HOME/arrow-thirdparty-deps
-# some output omitted
-
+$ ./thirdparty/download_dependencies $HOME/arrow-thirdparty
 # Environment variables for offline Arrow build
-export ARROW_BOOST_URL=$HOME/arrow-thirdparty-deps/boost.tar.gz
-export ARROW_GTEST_URL=$HOME/arrow-thirdparty-deps/gtest.tar.gz
-export ARROW_GFLAGS_URL=$HOME/arrow-thirdparty-deps/gflags.tar.gz
-export ARROW_GBENCHMARK_URL=$HOME/arrow-thirdparty-deps/gbenchmark.tar.gz
-export ARROW_FLATBUFFERS_URL=$HOME/arrow-thirdparty-deps/flatbuffers.tar.gz
-export ARROW_RAPIDJSON_URL=$HOME/arrow-thirdparty-deps/rapidjson.tar.gz
-export ARROW_SNAPPY_URL=$HOME/arrow-thirdparty-deps/snappy.tar.gz
-export ARROW_BROTLI_URL=$HOME/arrow-thirdparty-deps/brotli.tar.gz
-export ARROW_LZ4_URL=$HOME/arrow-thirdparty-deps/lz4.tar.gz
-export ARROW_ZLIB_URL=$HOME/arrow-thirdparty-deps/zlib.tar.gz
-export ARROW_ZSTD_URL=$HOME/arrow-thirdparty-deps/zstd.tar.gz
-export ARROW_PROTOBUF_URL=$HOME/arrow-thirdparty-deps/protobuf.tar.gz
-export ARROW_GRPC_URL=$HOME/arrow-thirdparty-deps/grpc.tar.gz
-export ARROW_ORC_URL=$HOME/arrow-thirdparty-deps/orc.tar.gz
+export ARROW_BOOST_URL=$HOME/arrow-thirdparty/boost-1.67.0.tar.gz
+export ARROW_BROTLI_URL=$HOME/arrow-thirdparty/brotli-v0.6.0.tar.gz
+export ARROW_DOUBLE_CONVERSION_URL=$HOME/arrow-thirdparty/double-conversion-v3.1.1.tar.gz
+export ARROW_FLATBUFFERS_URL=$HOME/arrow-thirdparty/flatbuffers-02a7807dd8d26f5668ffbbec0360dc107bbfabd5.tar.gz
+export ARROW_GBENCHMARK_URL=$HOME/arrow-thirdparty/gbenchmark-v1.4.1.tar.gz
+export ARROW_GFLAGS_URL=$HOME/arrow-thirdparty/gflags-v2.2.0.tar.gz
+export ARROW_GLOG_URL=$HOME/arrow-thirdparty/glog-v0.3.5.tar.gz
+export ARROW_GRPC_URL=$HOME/arrow-thirdparty/grpc-v1.14.1.tar.gz
+export ARROW_GTEST_URL=$HOME/arrow-thirdparty/gtest-1.8.0.tar.gz
+export ARROW_LZ4_URL=$HOME/arrow-thirdparty/lz4-v1.7.5.tar.gz
+export ARROW_ORC_URL=$HOME/arrow-thirdparty/orc-1.5.1.tar.gz
+export ARROW_PROTOBUF_URL=$HOME/arrow-thirdparty/protobuf-v3.6.1.tar.gz
+export ARROW_RAPIDJSON_URL=$HOME/arrow-thirdparty/rapidjson-v1.1.0.tar.gz
+export ARROW_RE2_URL=$HOME/arrow-thirdparty/re2-2018-10-01.tar.gz
+export ARROW_SNAPPY_URL=$HOME/arrow-thirdparty/snappy-1.1.3.tar.gz
+export ARROW_THRIFT_URL=$HOME/arrow-thirdparty/thrift-0.11.0.tar.gz
+export ARROW_ZLIB_URL=$HOME/arrow-thirdparty/zlib-1.2.8.tar.gz
+export ARROW_ZSTD_URL=$HOME/arrow-thirdparty/zstd-v1.3.7.tar.gz
 ```
 
 This can be automated by using inline source/eval:
diff --git a/cpp/thirdparty/download_dependencies.sh b/cpp/thirdparty/download_dependencies.sh
index de7d23c..f782963 100755
--- a/cpp/thirdparty/download_dependencies.sh
+++ b/cpp/thirdparty/download_dependencies.sh
@@ -30,7 +30,7 @@ else
   DESTDIR=$1
 fi
 
-DESTDIR=$(realpath "${DESTDIR}")
+DESTDIR=$(readlink -f "${DESTDIR}")
 
 download_dependency() {
   local url=$1