diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-06-15 01:04:22 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-14 16:04:22 -0700 |
| commit | aac6c06af49a91c1d847c838d2059983080dc6d5 (patch) | |
| tree | 79da3268140bb54208189d29aff13e2a6756a221 | |
| parent | 0ad6aaeebb0fe574a683536e8de0f67033adc99a (diff) | |
| download | vcpkg-aac6c06af49a91c1d847c838d2059983080dc6d5.tar.gz vcpkg-aac6c06af49a91c1d847c838d2059983080dc6d5.zip | |
[arrow] fix findzstd patch (#6757)
| -rw-r--r-- | ports/arrow/CONTROL | 2 | ||||
| -rw-r--r-- | ports/arrow/findzstd.patch | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/arrow/CONTROL b/ports/arrow/CONTROL index 1bfaa8a97..1b32c76b6 100644 --- a/ports/arrow/CONTROL +++ b/ports/arrow/CONTROL @@ -1,4 +1,4 @@ Source: arrow -Version: 0.13.0-3 +Version: 0.13.0-4 Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser 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/findzstd.patch b/ports/arrow/findzstd.patch index c45f12d0b..ac77202f9 100644 --- a/ports/arrow/findzstd.patch +++ b/ports/arrow/findzstd.patch @@ -11,11 +11,12 @@ index 21b4981ec..818e4b5e1 100644 -endif()
-
+set(ZSTD_LIB_NAME_DEBUG_SUFFIX d)
- set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+-set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") ++set(ZSTD_STATIC_LIB_SUFFIX "${ZSTD_MSVC_STATIC_LIB_SUFFIX}")
set(ZSTD_STATIC_LIB_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
-+set(ZSTD_LIB_NAMES_RELEASE zstd "${ZSTD_STATIC_LIB_NAME}" "lib${ZSTD_STATIC_LIB_NAME}"
-+ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd${ZSTD_LIB_NAME_DEBUG_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}")
++set(ZSTD_LIB_NAMES_RELEASE zstd "${ZSTD_STATIC_LIB_NAME}"
++ "${CMAKE_SHARED_LIBRARY_PREFIX}zstd")
+set(ZSTD_LIB_NAMES_DEBUG)
+foreach(_zstd_name ${ZSTD_LIB_NAMES_RELEASE})
+ list(APPEND ZSTD_LIB_NAMES_DEBUG ${_zstd_name}${ZSTD_LIB_NAME_DEBUG_SUFFIX})
|