diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-11-12 23:28:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 14:28:59 -0800 |
| commit | b518035a33941380c044b00a1b4f8abff764cbdc (patch) | |
| tree | c9629a0adac4806672f162461ea5c8de7850a55e /ports/arrow | |
| parent | f50c0eae60fb1391d610451289e877784228eb18 (diff) | |
| download | vcpkg-b518035a33941380c044b00a1b4f8abff764cbdc.tar.gz vcpkg-b518035a33941380c044b00a1b4f8abff764cbdc.zip | |
[ZSTD] Update to 1.4.5 (#14395)
* [ZSTD] Update to 1.4.5
* [zstd] fix wrong assert to fix uwp regressions
* always install *.pc file. Correct -l flag in pc file
* fix orc regression
* fix arrow regressions
* fix orc zstd linkage
* fix find_package(ZSTD)
* install zstd dlls.
* fix the patch due to a replacement error
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/arrow')
| -rw-r--r-- | ports/arrow/CONTROL | 2 | ||||
| -rw-r--r-- | ports/arrow/portfile.cmake | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index ed8a024cd..b228586a3 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,6 +1,6 @@ Source: arrow Version: 1.0.1 -Port-Version: 1 +Port-Version: 2 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, bzip2, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser, openssl, utf8proc Homepage: https://github.com/apache/arrow Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations. diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 28f11a6fd..2ff21fc57 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "filesystem" ARROW_FILESYSTEM ) +file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/FindZSTD.cmake") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/cpp PREFER_NINJA @@ -30,10 +32,10 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} - -DARROW_BROTLI_USE_SHARED=${ARROW_BUILD_SHARED} - -DARROW_GFLAGS_USE_SHARED=${ARROW_BUILD_SHARED} - -DARROW_UTF8PROC_USE_SHARED=${ARROW_BUILD_SHARED} - -DARROW_ZSTD_USE_SHARED=${ARROW_BUILD_SHARED} + -DARROW_BROTLI_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets + -DARROW_GFLAGS_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets + -DARROW_UTF8PROC_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets + -DARROW_ZSTD_USE_SHARED=${ARROW_BUILD_SHARED} # This can be wrong in custom triplets -DARROW_JEMALLOC=OFF -DARROW_BUILD_UTILITIES=OFF -DARROW_WITH_BZ2=ON |