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 cc33723 ARROW-4893: [C++] conda packages should use inside of
conda-build
cc33723 is described below
commit cc33723eca125fba5043bc945b21a49d50989f3f
Author: Korn, Uwe <[email protected]>
AuthorDate: Sat Mar 16 18:15:09 2019 -0500
ARROW-4893: [C++] conda packages should use inside of conda-build
Author: Korn, Uwe <[email protected]>
Author: Uwe L. Korn <[email protected]>
Closes #3917 from xhochy/ARROW-4893 and squashes the following commits:
9596c467f <Uwe L. Korn> Add missing run requirements
bc445f857 <Korn, Uwe> ARROW-4893: conda packages should use inside of
conda-build
---
dev/tasks/conda-recipes/arrow-cpp/bld.bat | 2 ++
dev/tasks/conda-recipes/arrow-cpp/build.sh | 5 ++---
dev/tasks/conda-recipes/arrow-cpp/meta.yaml | 28 ++++++++++++++++------------
3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/dev/tasks/conda-recipes/arrow-cpp/bld.bat
b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
index de08c6c..2bfd49c 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/bld.bat
+++ b/dev/tasks/conda-recipes/arrow-cpp/bld.bat
@@ -22,6 +22,8 @@ set ARROW_BUILD_TOOLCHAIN=%LIBRARY_PREFIX%
cmake -G "%CMAKE_GENERATOR%" ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+ -DARROW_DEPENDENCY_SOURCE=SYSTEM ^
+ -DARROW_PACKAGE_PREFIX="%LIBRARY_PREFIX%" ^
-DARROW_BOOST_USE_SHARED:BOOL=ON ^
-DARROW_BUILD_TESTS:BOOL=OFF ^
-DARROW_BUILD_UTILITIES:BOOL=OFF ^
diff --git a/dev/tasks/conda-recipes/arrow-cpp/build.sh
b/dev/tasks/conda-recipes/arrow-cpp/build.sh
index 3d7dbb7..98e7140 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/build.sh
+++ b/dev/tasks/conda-recipes/arrow-cpp/build.sh
@@ -20,9 +20,6 @@
set -e
set -x
-# Build dependencies
-export ARROW_BUILD_TOOLCHAIN=$PREFIX
-
cd cpp
mkdir build-dir
cd build-dir
@@ -31,6 +28,8 @@ cmake \
-DCMAKE_BUILD_TYPE=release \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DCMAKE_INSTALL_LIBDIR=$PREFIX/lib \
+ -DARROW_DEPENDENCY_SOURCE=SYSTEM \
+ -DARROW_PACKAGE_PREFIX=$PREFIX \
-DARROW_BOOST_USE_SHARED=ON \
-DARROW_BUILD_BENCHMARKS=OFF \
-DARROW_BUILD_UTILITIES=OFF \
diff --git a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
index 9afd5d0..9a4c5d6 100644
--- a/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
+++ b/dev/tasks/conda-recipes/arrow-cpp/meta.yaml
@@ -38,28 +38,32 @@ requirements:
- {{ compiler('cxx') }}
host:
- boost-cpp
+ - brotli
- double-conversion
- - thrift-cpp >=0.11
- - libprotobuf
- flatbuffers
- - rapidjson
- - zlib
- - glog
- gflags
- - snappy
- - brotli
- - zstd
+ - glog
+ - libprotobuf
- lz4-c
- - python
- numpy 1.14.*
+ - python
+ - rapidjson
+ - snappy
+ - thrift-cpp >=0.11
+ - zlib
+ - zstd
run:
- - boost-cpp
- - python
- {{ pin_compatible('numpy', lower_bound='1.14') }}
+ - boost-cpp
+ - brotli
- gflags
- - snappy # [win and py>=35]
+ - glog
+ - lz4-c
+ - python
+ - snappy
- zlib
+ - zstd
test:
commands:
