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 3bf1e39 ARROW-4881: [C++] remove references to ARROW_BUILD_TOOLCHAIN
3bf1e39 is described below
commit 3bf1e391bb7b1c85c93b0b78a8981aa9663f23ff
Author: Benjamin Kietzman <[email protected]>
AuthorDate: Thu Mar 21 15:32:32 2019 +0100
ARROW-4881: [C++] remove references to ARROW_BUILD_TOOLCHAIN
`ARROW_BUILD_TOOLCHAIN` has been superceded since the cmake refactor, but a
few scripts still set and use it.
Author: Benjamin Kietzman <[email protected]>
Closes #3993 from bkietz/4881-bundle-zlib-CMake-function-still-uses-AR and
squashes the following commits:
8f34a54d <Benjamin Kietzman> typo: \L -> \\L
da7ba211 <Benjamin Kietzman> remove references to ARROW_BUILD_TOOLCHAIN
---
ci/docker_build_r.sh | 1 -
ci/travis_script_python.sh | 9 +++------
dev/container/script/env.sh | 1 -
dev/gen_apidocs/create_documents.sh | 1 -
dev/hiveserver2/hiveserver2.sh | 1 -
dev/lint/run_iwyu.sh | 2 --
dev/release/verify-release-candidate.bat | 2 --
dev/tasks/conda-recipes/arrow-cpp/bld.bat | 2 --
dev/tasks/python-wheels/win-build.bat | 1 -
docs/source/developers/cpp.rst | 1 -
python/CMakeLists.txt | 4 ++--
python/asv-build.sh | 1 -
12 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/ci/docker_build_r.sh b/ci/docker_build_r.sh
index 6e67678..7f72cdf 100755
--- a/ci/docker_build_r.sh
+++ b/ci/docker_build_r.sh
@@ -18,7 +18,6 @@
set -e
-export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
export ARROW_HOME=$CONDA_PREFIX
# Build arrow
diff --git a/ci/travis_script_python.sh b/ci/travis_script_python.sh
index 1e049c4..710ebb9 100755
--- a/ci/travis_script_python.sh
+++ b/ci/travis_script_python.sh
@@ -33,12 +33,9 @@ PYTHON_VERSION=$1
CONDA_ENV_DIR=$TRAVIS_BUILD_DIR/pyarrow-test-$PYTHON_VERSION
# We should use zlib in the target Python directory to avoid loading
-# wrong libpython on macOS at run-time. If we use zlib in
-# $ARROW_BUILD_TOOLCHAIN and libpython3.6m.dylib exists in both
-# $ARROW_BUILD_TOOLCHAIN and $CONDA_ENV_DIR, arrow-python-test uses
-# libpython3.6m.dylib on $ARROW_BUILD_TOOLCHAIN not $CONDA_ENV_DIR.
-# libpython3.6m.dylib on $ARROW_BUILD_TOOLCHAIN doesn't have NumPy. So
-# python-test fails.
+# the wrong libpython on macOS at run-time. Another zlib might sit in a
+# directory with a different libpython3.6m.dylib, and that libpython3.6m.dylib
+# may not have NumPy (which is required for python-test)
export ZLIB_HOME=$CONDA_ENV_DIR
if [ "$ARROW_TRAVIS_PYTHON_JVM" == "1" ]; then
diff --git a/dev/container/script/env.sh b/dev/container/script/env.sh
index 41effdd..d5b670f 100644
--- a/dev/container/script/env.sh
+++ b/dev/container/script/env.sh
@@ -19,7 +19,6 @@
# See also https://arrow.apache.org/docs/python/development.html#build-and-test
conda activate pyarrow-dev
export ARROW_BUILD_TYPE=release
-export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
export PARQUET_BUILD_TOOLCHAIN=$CONDA_PREFIX
export ARROW_HOME=$CONDA_PREFIX
export PARQUET_HOME=$CONDA_PREFIX
diff --git a/dev/gen_apidocs/create_documents.sh
b/dev/gen_apidocs/create_documents.sh
index ee8f8c8..c946f48 100755
--- a/dev/gen_apidocs/create_documents.sh
+++ b/dev/gen_apidocs/create_documents.sh
@@ -45,7 +45,6 @@ popd
# Make Python documentation (Depends on C++ )
# Build Arrow C++
-export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
export LD_LIBRARY_PATH=/apidocs-dist/lib:${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}
export PKG_CONFIG_PATH=${CONDA_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}
export PKG_CONFIG_PATH=/apidocs-dist/lib/pkgconfig:${PKG_CONFIG_PATH}
diff --git a/dev/hiveserver2/hiveserver2.sh b/dev/hiveserver2/hiveserver2.sh
index 4dbaa76..664b7b8 100755
--- a/dev/hiveserver2/hiveserver2.sh
+++ b/dev/hiveserver2/hiveserver2.sh
@@ -27,7 +27,6 @@ conda activate pyarrow-dev
# Arrow build variables
export ARROW_BUILD_TYPE=debug
-export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
export ARROW_HOME=$CONDA_PREFIX
# For newer GCC per
https://arrow.apache.org/docs/python/development.html#known-issues
diff --git a/dev/lint/run_iwyu.sh b/dev/lint/run_iwyu.sh
index 0500968..edae841 100755
--- a/dev/lint/run_iwyu.sh
+++ b/dev/lint/run_iwyu.sh
@@ -18,8 +18,6 @@
set -eux
-export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
-
mkdir -p /build/lint
pushd /build/lint
diff --git a/dev/release/verify-release-candidate.bat
b/dev/release/verify-release-candidate.bat
index f5f9e96..7d060b7 100644
--- a/dev/release/verify-release-candidate.bat
+++ b/dev/release/verify-release-candidate.bat
@@ -57,8 +57,6 @@ set CONFIGURATION=release
pushd %ARROW_SOURCE%
-set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
-
set ARROW_HOME=%INSTALL_DIR%
set PARQUET_HOME=%INSTALL_DIR%
set PATH=%INSTALL_DIR%\bin;%PATH%
diff --git a/dev/tasks/conda-recipes/arrow-cpp/bld.bat
b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
index 2bfd49c..7e713e8 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/bld.bat
+++ b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
@@ -18,8 +18,6 @@
mkdir "%SRC_DIR%"\cpp\build
pushd "%SRC_DIR%"\cpp\build
-set ARROW_BUILD_TOOLCHAIN=%LIBRARY_PREFIX%
-
cmake -G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
-DARROW_DEPENDENCY_SOURCE=SYSTEM ^
diff --git a/dev/tasks/python-wheels/win-build.bat
b/dev/tasks/python-wheels/win-build.bat
index 8f7f6f4..02cd57d 100644
--- a/dev/tasks/python-wheels/win-build.bat
+++ b/dev/tasks/python-wheels/win-build.bat
@@ -41,7 +41,6 @@ popd
set ARROW_HOME=%CONDA_PREFIX%\Library
set PARQUET_HOME=%CONDA_PREFIX%\Library
-set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
echo %ARROW_HOME%
diff --git a/docs/source/developers/cpp.rst b/docs/source/developers/cpp.rst
index 60da1a0..9025bce 100644
--- a/docs/source/developers/cpp.rst
+++ b/docs/source/developers/cpp.rst
@@ -802,7 +802,6 @@ tests can be made with there individual make targets).
SET ARROW_LLVM_VERSION=7.0.*
SET PYTHON=3.6
SET ARCH=64
- SET ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
SET
PATH=C:\Users\User\Anaconda3;C:\Users\User\Anaconda3\Scripts;C:\Users\User\Anaconda3\Library\bin;%PATH%
SET BOOST_LIBRARYDIR=C:\Boost\lib
SET BOOST_ROOT=C:\Boost
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 63a8cd0..b195210 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -275,8 +275,8 @@ function(bundle_zlib)
if(MSVC)
# zlib uses zlib.dll for Windows
set(ZLIB_SHARED_LIB_NAME zlib.dll)
- if(DEFINED ENV{ARROW_BUILD_TOOLCHAIN})
- set(ZLIB_HOME "$ENV{ARROW_BUILD_TOOLCHAIN}")
+ if(DEFINED ENV{CONDA_PREFIX})
+ set(ZLIB_HOME "$ENV{CONDA_PREFIX}\\Library")
endif()
if(DEFINED ENV{ZLIB_HOME})
set(ZLIB_HOME "$ENV{ZLIB_HOME}")
diff --git a/python/asv-build.sh b/python/asv-build.sh
index 90c7872..0149ee2 100755
--- a/python/asv-build.sh
+++ b/python/asv-build.sh
@@ -27,7 +27,6 @@ source activate $ASV_ENV_DIR
echo "== Conda Prefix for benchmarks: " $CONDA_PREFIX " =="
# Build Arrow C++ libraries
-export ARROW_BUILD_TOOLCHAIN=$CONDA_PREFIX
export ARROW_HOME=$CONDA_PREFIX
export PARQUET_HOME=$CONDA_PREFIX
export ORC_HOME=$CONDA_PREFIX
