Skip to content

Commit

Permalink
Add snappy to PKGBUILD; prune some default cmake flags and add comment
Browse files Browse the repository at this point in the history
  • Loading branch information
nealrichardson committed Jun 24, 2019
1 parent 596faf3 commit d7a7419
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 2 additions & 4 deletions ci/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ license=("Apache-2.0")
depends=("${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-double-conversion"
"${MINGW_PACKAGE_PREFIX}-thrift"
"${MINGW_PACKAGE_PREFIX}-snappy"
"${MINGW_PACKAGE_PREFIX}-zlib")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-gcc")
Expand Down Expand Up @@ -72,13 +73,9 @@ build() {
-DCMAKE_BUILD_TYPE=${cmake_build_type} \
-DARROW_BUILD_STATIC=ON \
-DARROW_BUILD_SHARED=OFF \
-DARROW_BUILD_TESTS=OFF \
-DARROW_PARQUET=ON \
-DARROW_PLASMA=OFF \
-DARROW_HDFS=OFF \
-DARROW_PYTHON=OFF \
-DARROW_BOOST_USE_SHARED=OFF \
-DARROW_WITH_SNAPPY=OFF \
-DARROW_WITH_ZSTD=OFF \
-DARROW_WITH_LZ4=OFF \
-DARROW_JEMALLOC=OFF \
Expand All @@ -90,6 +87,7 @@ build() {
-Ddouble-conversion_ROOT="${MINGW_PREFIX}" \
-DThrift_ROOT="${MINGW_PREFIX}"

# Workaround for a compile error that appears with GCC 4.9.3
sed -i 's/-fPIC/ /g' flatbuffers_ep-prefix/src/flatbuffers_ep-stamp/flatbuffers_ep-configure-RELEASE.cmake

make
Expand Down
3 changes: 3 additions & 0 deletions ci/windows-pkg-arrow-for-r.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ wget https://dl.bintray.com/rtools/backports/mingw-w64-x86_64-thrift-0.12.0-8000
# double-conversion is only available in the Rtools4.0 builds, but apparently that's ok
wget https://dl.bintray.com/rtools/mingw64/mingw-w64-x86_64-double-conversion-3.1.2-1-any.pkg.tar.xz
wget https://dl.bintray.com/rtools/mingw32/mingw-w64-i686-double-conversion-3.1.2-1-any.pkg.tar.xz
# And snappy
wget https://dl.bintray.com/rtools/mingw32/mingw-w64-i686-snappy-1.1.7-2-any.pkg.tar.xz
wget https://dl.bintray.com/rtools/mingw64/mingw-w64-x86_64-snappy-1.1.7-2-any.pkg.tar.xz
ls | xargs -n 1 tar -xJf
cd ..

Expand Down

0 comments on commit d7a7419

Please sign in to comment.